From 9fc7608193744267fdee34dafa67c10ed111408e Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 1 Mar 2022 12:35:50 +0300 Subject: [PATCH 1/4] [DE] Fix Bug 55763 --- apps/documenteditor/mobile/src/less/app.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 9de1ee6a8..24f421af0 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -167,4 +167,8 @@ } } - +.calendar-sheet{ + .calendar-day-weekend { + color: #D25252; + } +} From 37c1275b369c49546647fb81b6dc3b031d07e1ac Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 3 Mar 2022 13:27:50 +0300 Subject: [PATCH 2/4] [SSE] Fix Bug 55814 --- apps/spreadsheeteditor/mobile/src/less/app.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index 323279360..123cfc140 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -134,8 +134,8 @@ border-radius: 2px; } } - .page{ - top: 30px; + .navbar { + top: -1px; } } From 3aff08333f4f1180736b6526c939f5f2d510b16a Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 3 Mar 2022 17:11:15 +0300 Subject: [PATCH 3/4] [DE PE SSE] Fix Bug 55865 --- apps/common/mobile/resources/less/common-material.less | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index dfd53ab6f..2c86a3010 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -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; } From 81258c1830726e91cb30b59892f9896420f9da66 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 3 Mar 2022 17:49:55 +0300 Subject: [PATCH 4/4] [PE] Fix Bug 55867 --- apps/presentationeditor/mobile/src/controller/Main.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index 6d1ac5f12..cd4bb85da 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -627,10 +627,11 @@ class MainController extends Component { } onAdvancedOptions (type, advOptions) { + const { t } = this.props; + const _t = t('Controller.Main', {returnObjects:true}); + if ($$('.dlg-adv-options.modal-in').length > 0) return; - const _t = this._t; - if (type == Asc.c_oAscAdvancedOptionsID.DRM) { Common.Notifications.trigger('preloader:close'); Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument, true);