From 24024fac8f1d9909af88a217944046f3bd5eb146 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 28 Sep 2021 11:09:07 +0300 Subject: [PATCH] [SSE modile] refactoring --- apps/common/mobile/resources/css/skeleton.css | 6 +++++- apps/spreadsheeteditor/mobile/src/index_dev.html | 8 +++----- vendor/framework7-react/build/webpack.config.js | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/common/mobile/resources/css/skeleton.css b/apps/common/mobile/resources/css/skeleton.css index b6fcad21d..ef43cc071 100644 --- a/apps/common/mobile/resources/css/skeleton.css +++ b/apps/common/mobile/resources/css/skeleton.css @@ -23,7 +23,11 @@ body { } .skl-navbar.skl-navbar--md { - height: calc(56px + 26px); + /*height: calc(56px + 26px);*/ +} + +.skl-navbar.skl-navbar--ios { + background-color: #f7f7f8; } .skl-navbar.skl-navbar--word:not(.skl-navbar--ios) { diff --git a/apps/spreadsheeteditor/mobile/src/index_dev.html b/apps/spreadsheeteditor/mobile/src/index_dev.html index 463be360a..6ba4fe789 100644 --- a/apps/spreadsheeteditor/mobile/src/index_dev.html +++ b/apps/spreadsheeteditor/mobile/src/index_dev.html @@ -23,10 +23,10 @@ - <% if (!htmlWebpackPlugin.options.skeleton.content) { %> + <% if (!htmlWebpackPlugin.options.skeleton.stylesheet) { %> <% } else { %> - + <% } %> @@ -41,9 +41,7 @@ // Framework7 doesn't set Device.android flag when navigator.platform == 'Win32', change it for debug navigator.__defineGetter__('platform', () => 'Win32Debug'); - const element_add_class = (el, cls) => { - el && el.classList.add(cls) - } + const element_add_class = (el, cls) => (el && el.classList.add(cls)); let navbar = document.querySelector('.skl-navbar'); if ( window.devicePixelRatio ) { diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js index 31b666092..447c2d9ef 100644 --- a/vendor/framework7-react/build/webpack.config.js +++ b/vendor/framework7-react/build/webpack.config.js @@ -205,7 +205,7 @@ module.exports = { useShortDoctype: true } : false, skeleton: { - content: env === 'development' ? undefined : fs.readFileSync(`../../apps/common/mobile/resources/css/skeleton.css`), + stylesheet: env === 'development' ? undefined : fs.readFileSync(`../../apps/common/mobile/resources/css/skeleton.css`), }, }), new CopyWebpackPlugin({