From efbd7dd79f6468ad303b8b4cb749e2b7fc977c55 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 14 Nov 2022 14:51:56 +0300 Subject: [PATCH 1/2] [mobile] for bug 58703 --- apps/common/mobile/resources/css/skeleton.css | 24 +++++++++++++++++++ apps/common/mobile/utils/htmlutils.js | 2 +- apps/documenteditor/mobile/src/index_dev.html | 1 + .../mobile/src/index_dev.html | 1 + .../mobile/src/index_dev.html | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/apps/common/mobile/resources/css/skeleton.css b/apps/common/mobile/resources/css/skeleton.css index 0ac99096e..249697e9b 100644 --- a/apps/common/mobile/resources/css/skeleton.css +++ b/apps/common/mobile/resources/css/skeleton.css @@ -116,3 +116,27 @@ body.theme-type-dark { 50% { opacity:1; } 100% { opacity:0.1; } } + +.navbar.navbar-with-logo { + height: 34px; +} + +:root .theme-type-dark { + --f7-navbar-bg-color: #232323; + --f7-subnavbar-bg-color: #232323; +} + +.md .word-editor { + --f7-navbar-bg-color: var(--background-navbar-word, #446995); + --f7-subnavbar-bg-color: var(--background-navbar-word, #446995); +} + +.md .cell-editor { + --f7-navbar-bg-color: var(--background-navbar-word, #40865c); + --f7-subnavbar-bg-color: var(--background-navbar-word, #40865c); +} + +.md .slide-editor { + --f7-navbar-bg-color: var(--background-navbar-word, #aa5252); + --f7-subnavbar-bg-color: var(--background-navbar-word, #aa5252); +} \ No newline at end of file diff --git a/apps/common/mobile/utils/htmlutils.js b/apps/common/mobile/utils/htmlutils.js index 5bbfd0de1..91b624ba3 100644 --- a/apps/common/mobile/utils/htmlutils.js +++ b/apps/common/mobile/utils/htmlutils.js @@ -22,4 +22,4 @@ if ( !obj ) { localStorage && localStorage.setItem("mobile-ui-theme", JSON.stringify(obj)); } -document.body.classList.add(`theme-type-${obj.type}`); +document.body.classList.add(`theme-type-${obj.type}`, `${window.editor}-editor`); diff --git a/apps/documenteditor/mobile/src/index_dev.html b/apps/documenteditor/mobile/src/index_dev.html index 939932bab..be1a10d0a 100644 --- a/apps/documenteditor/mobile/src/index_dev.html +++ b/apps/documenteditor/mobile/src/index_dev.html @@ -25,6 +25,7 @@ <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% } %> diff --git a/apps/presentationeditor/mobile/src/index_dev.html b/apps/presentationeditor/mobile/src/index_dev.html index 631114ced..45e59a0e6 100644 --- a/apps/presentationeditor/mobile/src/index_dev.html +++ b/apps/presentationeditor/mobile/src/index_dev.html @@ -26,6 +26,7 @@ <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% } %> diff --git a/apps/spreadsheeteditor/mobile/src/index_dev.html b/apps/spreadsheeteditor/mobile/src/index_dev.html index b9b13f4c9..65edaff05 100644 --- a/apps/spreadsheeteditor/mobile/src/index_dev.html +++ b/apps/spreadsheeteditor/mobile/src/index_dev.html @@ -26,6 +26,7 @@ <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% } %> From 4f5286150b2118e48ec140d4441c50cc99c8131a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 14 Nov 2022 16:13:36 +0300 Subject: [PATCH 2/2] [mobile] debug app launch --- apps/common/mobile/resources/css/skeleton.css | 6 +++++- apps/common/mobile/utils/htmlutils.js | 2 +- apps/documenteditor/mobile/src/index_dev.html | 2 +- apps/documenteditor/mobile/src/page/main.jsx | 9 ++++++--- apps/presentationeditor/mobile/src/index_dev.html | 2 +- apps/spreadsheeteditor/mobile/src/index_dev.html | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/apps/common/mobile/resources/css/skeleton.css b/apps/common/mobile/resources/css/skeleton.css index 249697e9b..85c8c2031 100644 --- a/apps/common/mobile/resources/css/skeleton.css +++ b/apps/common/mobile/resources/css/skeleton.css @@ -117,10 +117,14 @@ body.theme-type-dark { 100% { opacity:0.1; } } -.navbar.navbar-with-logo { +.md .navbar.navbar-with-logo { height: 34px; } +.ios .navbar.navbar-with-logo { + height: 26px; +} + :root .theme-type-dark { --f7-navbar-bg-color: #232323; --f7-subnavbar-bg-color: #232323; diff --git a/apps/common/mobile/utils/htmlutils.js b/apps/common/mobile/utils/htmlutils.js index 91b624ba3..7c1cbc0b5 100644 --- a/apps/common/mobile/utils/htmlutils.js +++ b/apps/common/mobile/utils/htmlutils.js @@ -22,4 +22,4 @@ if ( !obj ) { localStorage && localStorage.setItem("mobile-ui-theme", JSON.stringify(obj)); } -document.body.classList.add(`theme-type-${obj.type}`, `${window.editor}-editor`); +document.body.classList.add(`theme-type-${obj.type}`, `${window.asceditor}-editor`); diff --git a/apps/documenteditor/mobile/src/index_dev.html b/apps/documenteditor/mobile/src/index_dev.html index be1a10d0a..131c5e153 100644 --- a/apps/documenteditor/mobile/src/index_dev.html +++ b/apps/documenteditor/mobile/src/index_dev.html @@ -25,7 +25,7 @@ <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% } %> diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index 3a48f88e1..adf517762 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -33,6 +33,12 @@ class MainPage extends Component { }; } + componentDidMount() { + if ( $$('.skl-container').length ) { + $$('.skl-container').remove(); + } + } + handleClickToOpenOptions = (opts, showOpts) => { f7.popover.close('.document-menu.modal-in', false); @@ -141,9 +147,6 @@ class MainPage extends Component { } const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); - if ($$('.skl-container').length) { - $$('.skl-container').remove(); - } return ( diff --git a/apps/presentationeditor/mobile/src/index_dev.html b/apps/presentationeditor/mobile/src/index_dev.html index 45e59a0e6..d5996c297 100644 --- a/apps/presentationeditor/mobile/src/index_dev.html +++ b/apps/presentationeditor/mobile/src/index_dev.html @@ -26,7 +26,7 @@ <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% } %> diff --git a/apps/spreadsheeteditor/mobile/src/index_dev.html b/apps/spreadsheeteditor/mobile/src/index_dev.html index 65edaff05..3a7fab6c6 100644 --- a/apps/spreadsheeteditor/mobile/src/index_dev.html +++ b/apps/spreadsheeteditor/mobile/src/index_dev.html @@ -26,7 +26,7 @@ <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% } %>