From 9a8341b85a4a40f4ec082833f7c35c4718bcff6b Mon Sep 17 00:00:00 2001 From: Andrey Shimagin Date: Tue, 5 Apr 2022 13:47:46 +0300 Subject: [PATCH 1/2] [DE PE] Fix Bug 56446 --- apps/common/mobile/resources/less/common.less | 6 +++--- apps/documenteditor/mobile/src/view/edit/EditShape.jsx | 4 ++-- apps/presentationeditor/mobile/src/view/edit/EditShape.jsx | 4 ++-- apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 9350d8846..7d6e7d1ec 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -71,9 +71,9 @@ color: @text-normal; padding: 15px 0 0 15px; } - - .range-number { - color: @text-normal; + + [slot="inner-end"] { + color: @text-normal; } } .page-content { diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index f447cc90b..e6ba1a45d 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -205,7 +205,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} > -
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -229,7 +229,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onOpacity(value)}} >
-
+
{stateOpacity + ' %'}
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index b851120ac..bd41e6a97 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -162,7 +162,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} >
-
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -186,7 +186,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onOpacity(value)}} >
-
+
{stateOpacity + ' %'}
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx index b20b26c0c..a8cef2809 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx @@ -156,7 +156,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} >
-
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -180,7 +180,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onOpacity(value)}} >
-
+
{stateOpacity + ' %'}
From 6560c83db0ec3edec84405f4f02cef8d29162336 Mon Sep 17 00:00:00 2001 From: Andrey Shimagin Date: Wed, 6 Apr 2022 11:35:25 +0300 Subject: [PATCH 2/2] [SSE] Fix color text in Filter --- apps/spreadsheeteditor/mobile/src/less/app.less | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index 0565ce531..6285cf3a8 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -167,10 +167,16 @@ } .sheet-filter, .popover-filter { - ul li:first-child .list-button{ - color: @text-normal; - &::after { - background: @background-menu-divider; + .list { + ul li:first-child .list-button{ + color: @text-normal; + &::after { + background: @background-menu-divider; + } + } + + .item-inner { + color: @text-normal; } } } \ No newline at end of file