Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'feature/for-bug-58703' into release/v7.3.0

Browse source
This commit is contained in:
Maxim Kadushkin 2022-11-14 16:15:13 +03:00
parent cedbefce78 4f5286150b
commit 1ea155391a
6 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
apps/common/mobile/resources/css/skeleton.css vendored
View file

@ -116,3 +116,31 @@ body.theme-type-dark {
50% { opacity:1; } 50% { opacity:1; }
100% { opacity:0.1; } 100% { opacity:0.1; }
} }
.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;
}
.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);
}

2
apps/common/mobile/utils/htmlutils.js
View file

@ -22,4 +22,4 @@ if ( !obj ) {
localStorage && localStorage.setItem("mobile-ui-theme", JSON.stringify(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.asceditor}-editor`);

1
apps/documenteditor/mobile/src/index_dev.html
View file

@ -25,6 +25,7 @@
<body> <body>
<% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %>
<script> <script>
window.asceditor = 'word';
<%= htmlWebpackPlugin.options.skeleton.htmlscript %> <%= htmlWebpackPlugin.options.skeleton.htmlscript %>
</script> </script>
<% } %> <% } %>

9
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -33,6 +33,12 @@ class MainPage extends Component {
}; };
} }
componentDidMount() {
if ( $$('.skl-container').length ) {
$$('.skl-container').remove();
}
}
handleClickToOpenOptions = (opts, showOpts) => { handleClickToOpenOptions = (opts, showOpts) => {
f7.popover.close('.document-menu.modal-in', false); 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)); const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
if ($$('.skl-container').length) {
$$('.skl-container').remove();
}
return ( return (
<Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}>

1
apps/presentationeditor/mobile/src/index_dev.html
View file

@ -26,6 +26,7 @@
<body> <body>
<% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %>
<script> <script>
window.asceditor = 'slide';
<%= htmlWebpackPlugin.options.skeleton.htmlscript %> <%= htmlWebpackPlugin.options.skeleton.htmlscript %>
</script> </script>
<% } %> <% } %>

1
apps/spreadsheeteditor/mobile/src/index_dev.html
View file

@ -26,6 +26,7 @@
<body> <body>
<% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %> <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %>
<script> <script>
window.asceditor = 'cell';
<%= htmlWebpackPlugin.options.skeleton.htmlscript %> <%= htmlWebpackPlugin.options.skeleton.htmlscript %>
</script> </script>
<% } %> <% } %>