From 7a5d73624b06b67f91b23281c55cb53422a5b5fe Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 25 Jan 2022 11:38:18 +0300 Subject: [PATCH 1/3] [SSE] Fix Bug 54820 --- apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx index 6c6906937..18dd0518c 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx @@ -44,6 +44,7 @@ const EditCell = props => { onFontSize: props.onFontSize, onFontClick: props.onFontClick }}/> + {!wsProps.FormatCells && <> @@ -127,8 +128,7 @@ const EditCell = props => { )})} ) : null} - } - + } ) }; From b70f1fc3ef12323e010c6971356943bb635d675d Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 25 Jan 2022 12:37:36 +0300 Subject: [PATCH 2/3] [SSE] Fix Bug 54969 --- apps/common/mobile/resources/less/common.less | 9 --------- apps/spreadsheeteditor/mobile/src/less/app.less | 14 +++++++++++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 435e7e547..2c413cf4e 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -909,15 +909,6 @@ input[type="number"]::-webkit-inner-spin-button { } } } - .function-info { - p { - color: @text-secondary; - } - h3 { - font-weight: 500; - color: @text-normal; - } - } } } } diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index 602a063e5..ce6c67388 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -54,13 +54,21 @@ //--f7-page-content-extra-padding-top: 37px; } -.function-info { - padding: 0 15px; -} .page-function-info { &.page-content, .page-content { background-color: @background-primary; } + + .function-info { + padding: 0 15px; + h3 { + color: @text-normal; + } + + p { + color: @text-secondary; + } + } } .username-tip.active { From 49e5d3ff6e4c260b7868c2ff480e7c535be9b2ec Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 25 Jan 2022 21:08:58 +0300 Subject: [PATCH 3/3] [SSE] Correct icon 'add' --- .../mobile/src/less/statusbar.less | 20 +++++++++++-------- .../mobile/src/view/Statusbar.jsx | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/less/statusbar.less b/apps/spreadsheeteditor/mobile/src/less/statusbar.less index 2daf9242a..c2cebdd47 100644 --- a/apps/spreadsheeteditor/mobile/src/less/statusbar.less +++ b/apps/spreadsheeteditor/mobile/src/less/statusbar.less @@ -61,14 +61,18 @@ } } - i.icon { - width: 22px; - height: 22px; - &.icon-plus { - // @source: ''; - // .encoded-svg-mask(@source, @fontColor); - // background-image: none; - .encoded-svg-mask('') + .tab { + i.icon { + width: 18px; + height: 18px; + &.icon-plus.bold{ + + // @source: ''; + // .encoded-svg-mask(@source, @fontColor); + // background-image: none; + .encoded-svg-mask('') + } } } + } diff --git a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx index bc1ccf646..6c09899e9 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx @@ -73,7 +73,7 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop {isEdit &&
- +
}