Merge pull request #1611 from ONLYOFFICE/feature/fix-bug-react

Feature/fix bug react
This commit is contained in:
maxkadushkin 2022-03-03 23:46:20 +03:00 committed by GitHub
commit d2c5b7ff1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 7 deletions

View file

@ -46,6 +46,10 @@
--f7-picker-item-text-color: rgba(var(--text-normal), 0.45);
--f7-picker-item-selected-text-color: @text-normal;
--f7-input-bg-color: @background-primary;
--f7-input-placeholder-color: @text-secondary;
--f7-input-text-color: @text-normal;
.button {
--f7-touch-ripple-color: transparent;
}
@ -86,7 +90,6 @@
--f7-list-item-text-text-color: @text-normal;
--f7-list-item-subtitle-text-color: @text-secondary;
--f7-block-title-text-color: @text-secondary;
--f7-input-placeholder-color: @text-secondary;
--f7-label-text-color: @text-normal;
--f7-page-bg-color: @background-tertiary;
--f7-list-bg-color: @background-primary;
@ -95,7 +98,6 @@
--f7-toggle-inactive-color: @background-menu-divider;
--f7-toggle-border-color: @background-menu-divider;
--f7-actions-button-text-color: @text-normal;
--f7-input-text-color: @text-normal;
--f7-subnavbar-border-color: @background-menu-divider;
--f7-list-border-color: @background-menu-divider;
}
@ -607,6 +609,7 @@
.inputs-list {
margin: 15px 0 0;
ul {
background: none;
&::before, &::after {
display: none;
}

View file

@ -167,4 +167,8 @@
}
}
.calendar-sheet{
.calendar-day-weekend {
color: #D25252;
}
}

View file

@ -627,9 +627,10 @@ class MainController extends Component {
}
onAdvancedOptions (type, advOptions) {
if ($$('.dlg-adv-options.modal-in').length > 0) return;
const { t } = this.props;
const _t = t('Controller.Main', {returnObjects:true});
const _t = this._t;
if ($$('.dlg-adv-options.modal-in').length > 0) return;
if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
Common.Notifications.trigger('preloader:close');

View file

@ -134,8 +134,8 @@
border-radius: 2px;
}
}
.page{
top: 30px;
.navbar {
top: -1px;
}
}