diff --git a/apps/common/mobile/resources/less/colors-table-dark.less b/apps/common/mobile/resources/less/colors-table-dark.less
index 9fa78999d..f2c790eff 100644
--- a/apps/common/mobile/resources/less/colors-table-dark.less
+++ b/apps/common/mobile/resources/less/colors-table-dark.less
@@ -23,12 +23,8 @@
--brand-secondary: #FFAF49;
--brand-text-on-brand: #000;
- --toolbar-de-background: #232323;
- --toolbar-pe-background: #232323;
- --toolbar-sse-background: #232323;
- --toolbar-de-icons: #208BFF;
- --toolbar-pe-icons: #FF4A31;
- --toolbar-sse-icons: #34C759;
+ --toolbar-background: #232323;
+ --toolbar-icons: #208BFF;
--toolbar-segment: #FFF;
--toolbar-tab-normal: #757575;
diff --git a/apps/common/mobile/resources/less/colors-table.less b/apps/common/mobile/resources/less/colors-table.less
index 4bd2ee5ad..40717c492 100644
--- a/apps/common/mobile/resources/less/colors-table.less
+++ b/apps/common/mobile/resources/less/colors-table.less
@@ -21,12 +21,8 @@
--fill-black: #000;
--fill-white: #FFF;
- --toolbar-de-background: #446995;
- --toolbar-pe-background: #AA5252;
- --toolbar-sse-background: #40865C;
- --toolbar-de-icons: #FFF;
- --toolbar-pe-icons: #FFF;
- --toolbar-sse-icons: #FFF;
+ --toolbar-background: #446995;
+ --toolbar-icons: #FFF;
--toolbar-segment: #446995;
--toolbar-tab-normal:fade(#FFF, 50%);
@@ -54,7 +50,6 @@
@fill-black: var(--fill-black);
@fill-white: var(--fill-white);
-@toolbar-background: var(--toolbar-background);
@toolbar-icons: var(--toolbar-icons);
@toolbar-segment: var(--toolbar-segment);
@toolbar-tab-normal: var(--toolbar-tab-normal);
diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less
index 33beb9354..580e6e563 100644
--- a/apps/common/mobile/resources/less/common-ios.less
+++ b/apps/common/mobile/resources/less/common-ios.less
@@ -1,5 +1,5 @@
-.device-ios {
+.device-ios .app-layout {
@blockTitleColor: #6d6d72;
@item-border-color: #c8c7cc;
--f7-list-item-border-color: @item-border-color;
@@ -13,7 +13,7 @@
--f7-navbar-title-font-size: 17px;
--f7-list-bg-color: @white;
- --f7-navbar-bg-color: #f7f7f8;
+ --f7-navbar-bg-color: @toolbar-background;
--f7-tabbar-link-inactive-color: @brandColor;
diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less
index 5eb42cad3..715784b4c 100644
--- a/apps/common/mobile/resources/less/common-material.less
+++ b/apps/common/mobile/resources/less/common-material.less
@@ -1,5 +1,5 @@
-.device-android, .device-android .theme-type-dark {
+.device-android .app-layout {
@tabLinkColor: rgba(255,255,255,.7);
@red: #f44336;
@white: #fff;
diff --git a/apps/common/mobile/resources/less/icons.less b/apps/common/mobile/resources/less/icons.less
index bb5757b75..0962430a8 100644
--- a/apps/common/mobile/resources/less/icons.less
+++ b/apps/common/mobile/resources/less/icons.less
@@ -23,7 +23,7 @@ i.icon {
&.icon-collaboration {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ //.encoded-svg-background('');
}
&.icon-cancellation {
width: 24px;
diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less
index 8fe8ff97f..64a54d2a4 100644
--- a/apps/common/mobile/resources/less/material/icons.less
+++ b/apps/common/mobile/resources/less/material/icons.less
@@ -32,7 +32,7 @@
&.icon-collaboration {
width: 24px;
height: 24px;
- .encoded-svg-mask('', @brandColor);
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-edit {
width: 22px;
diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less
index 81b37faed..7af159c82 100644
--- a/apps/presentationeditor/mobile/src/less/app.less
+++ b/apps/presentationeditor/mobile/src/less/app.less
@@ -5,9 +5,22 @@
@import '../../../../common/mobile/resources/less/colors-table-dark.less';
@brandColor: var(--brand-slide);
-@toolbar-background: var(--toolbar-pe-background);
// @navBarIconColor: var(--toolbar-pe-icons);
+.device-ios {
+ --toolbar-background: var(--background-primary, #fff);
+ --toolbar-icons: var(--brand-slide, #aa5252);
+}
+.device-android {
+ --toolbar-background: var(--brand-slide, #aa5252);
+
+ .theme-type-dark {
+ --toolbar-icons: var(--brand-slide, #aa5252);
+ }
+}
+
+@toolbar-background: var(--toolbar-background);
+
@import '../../../../common/mobile/resources/less/collaboration.less';
@import '../../../../common/mobile/resources/less/common.less';
@import '../../../../common/mobile/resources/less/common-ios.less';
diff --git a/apps/presentationeditor/mobile/src/less/icons-ios.less b/apps/presentationeditor/mobile/src/less/icons-ios.less
index c23966f15..79b7e8ca6 100644
--- a/apps/presentationeditor/mobile/src/less/icons-ios.less
+++ b/apps/presentationeditor/mobile/src/less/icons-ios.less
@@ -16,7 +16,7 @@
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @brandColor);
}
&.icon-play {
diff --git a/apps/presentationeditor/mobile/src/less/icons-material.less b/apps/presentationeditor/mobile/src/less/icons-material.less
index babce4172..09b0d73c7 100644
--- a/apps/presentationeditor/mobile/src/less/icons-material.less
+++ b/apps/presentationeditor/mobile/src/less/icons-material.less
@@ -28,7 +28,7 @@
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-mask('', @navBarIconColor);
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-play {
diff --git a/apps/presentationeditor/mobile/src/page/app.jsx b/apps/presentationeditor/mobile/src/page/app.jsx
index 55d94d9b2..c8c5d62d1 100644
--- a/apps/presentationeditor/mobile/src/page/app.jsx
+++ b/apps/presentationeditor/mobile/src/page/app.jsx
@@ -31,7 +31,7 @@ export default class extends React.Component {
render() {
return (
-
+
{/* Your main view, should have "view-main" class */}