diff --git a/apps/common/mobile/lib/controller/Themes.js b/apps/common/mobile/lib/controller/Themes.js
new file mode 100644
index 000000000..5e9d9bfc6
--- /dev/null
+++ b/apps/common/mobile/lib/controller/Themes.js
@@ -0,0 +1,48 @@
+import { Dom7 } from 'framework7'
+import { LocalStorage } from "../../utils/LocalStorage";
+
+class ThemesController {
+ constructor() {
+ this.themes_map = {
+ dark : {
+ id: 'theme-dark',
+ type:'dark'
+ },
+ light: {
+ id: 'theme-light',
+ type: 'light'
+ }};
+
+ const obj = LocalStorage.getItem("ui-theme");
+ let theme = this.themes_map.light;
+ if ( !!obj )
+ theme = this.themes_map[JSON.parse(obj).type];
+ else
+ if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) {
+ theme = this.themes_map['dark'];
+ LocalStorage.setItem("ui-theme", JSON.stringify(theme));
+ }
+
+ const $$ = Dom7;
+ const $body = $$('body');
+ $body.attr('class') && $body.attr('class', $body.attr('class').replace(/\s?theme-type-(?:dark|light)/, ''));
+ $body.addClass(`theme-type-${theme.type}`);
+ }
+
+ get isCurrentDark() {
+ const obj = LocalStorage.getItem("ui-theme");
+ return !!obj ? JSON.parse(obj).type === 'dark' : false;
+ }
+
+ switchDarkTheme(dark) {
+ const theme = this.themes_map[dark ? 'dark' : 'light'];
+ LocalStorage.setItem("ui-theme", JSON.stringify(theme));
+
+ const $body = $$('body');
+ $body.attr('class') && $body.attr('class', $body.attr('class').replace(/\s?theme-type-(?:dark|light)/, ''));
+ $body.addClass(`theme-type-${theme.type}`);
+ }
+}
+
+const themes = new ThemesController()
+export {themes as Themes}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/_mixins.less b/apps/common/mobile/resources/less/_mixins.less
index 139fa586b..4378affb1 100644
--- a/apps/common/mobile/resources/less/_mixins.less
+++ b/apps/common/mobile/resources/less/_mixins.less
@@ -1,8 +1,10 @@
// Encoded SVG Background
-.encoded-svg-mask(@svg, @color: @themeColor) {
+.encoded-svg-mask(@svg, @color: @brandColor) {
@url: `encodeURIComponent(@{svg})`;
background-color: @color;
-webkit-mask-image: url("data:image/svg+xml;charset=utf-8,@{url}");
+ -webkit-mask-size: contain;
+ -webkit-mask-repeat: round;
}
.encoded-svg-uncolored-mask(@svg) {
diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less
index 3072fb575..557eabaf8 100644
--- a/apps/common/mobile/resources/less/about.less
+++ b/apps/common/mobile/resources/less/about.less
@@ -1,4 +1,4 @@
-@text-normal: #000;
+// @text-normal: #000;
// @common-image-about-path - defined in webpack config
.about {
@@ -14,13 +14,14 @@
margin: 0 auto 15px;
a {
- color: @text-normal;
+ // color: @text-normal;
}
}
h3 {
font-weight: normal;
margin: 0;
+ color: @text-secondary;
&.vendor {
color: @text-normal;
@@ -30,13 +31,27 @@
}
p > label {
+ color: @text-normal;
margin-right: 5px;
+ color: @text-secondary;
}
.logo {
- display: inline-block;
- width: 100%;
- height: 55px;
- background: ~"url(@{common-image-about-path}/logo_s.svg) no-repeat center";
+ display: inline-block;
+ width: 100%;
+ height: 55px;
+ background: ~"url(@{common-image-about-path}/logo_s.svg) no-repeat center";
}
+
+ .theme-type-dark {
+ .about .logo {
+ background: ~"url(@{common-image-about-path}/logo-white_s.svg) no-repeat center";
+ }
+ }
}
+
+.theme-type-dark {
+ .about .logo {
+ background: ~"url(@{common-image-about-path}/logo-white_s.svg) no-repeat center";
+ }
+}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/collaboration.less b/apps/common/mobile/resources/less/collaboration.less
index eb0265178..af591d3e0 100644
--- a/apps/common/mobile/resources/less/collaboration.less
+++ b/apps/common/mobile/resources/less/collaboration.less
@@ -1,8 +1,6 @@
.page.page-users {
- background-color: @white;
.block-title {
text-transform: none;
- color: @black;
margin-top: 20px;
margin-bottom: 20px;
font-size: 17px;
@@ -15,7 +13,7 @@
text-align: center;
border-radius: 50px;
line-height: 40px;
- color: @white;
+ color: @fill-white;
font-size: 18px;
}
}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/colors-table-dark.less b/apps/common/mobile/resources/less/colors-table-dark.less
index f2c790eff..51062c360 100644
--- a/apps/common/mobile/resources/less/colors-table-dark.less
+++ b/apps/common/mobile/resources/less/colors-table-dark.less
@@ -6,6 +6,7 @@
--background-secondary: #333;
--background-tertiary: #131313;
--background-menu-divider: fade(#545458, 65%);
+ --background-button: #333333;
--text-normal: fade(#FFF, 87%);
--text-secondary: fade(#FFF, 60%);
@@ -18,7 +19,7 @@
--brand-word: #208BFF;
--brand-cell: #34C759;
- --brand-slide: #FF4A31;
+ --brand-slide: #FE8C33;
--brand-primary: #3E9CF0;
--brand-secondary: #FFAF49;
--brand-text-on-brand: #000;
@@ -29,5 +30,15 @@
--toolbar-tab-normal: #757575;
--component-disabled-opacity: .4;
+
+ --image-border-types-filter: invert(100%) brightness(4);
+
+ --canvas-content-background: #fff;
+
+ --active-opacity-word: fade(#446995, 20%);
+ --active-opacity-slide: fade(#AA5252, 20%);
+ --active-opacity-cell: fade(#40865C, 20%);
+
+ --image-border-types-filter: invert(100%) brightness(4);
}
}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/colors-table.less b/apps/common/mobile/resources/less/colors-table.less
index 5addf7759..739b351c6 100644
--- a/apps/common/mobile/resources/less/colors-table.less
+++ b/apps/common/mobile/resources/less/colors-table.less
@@ -11,6 +11,7 @@
--background-secondary: #FFF;
--background-tertiary: #EFF0F5;
--background-menu-divider: fade(#3C3C43, 36%);
+ --background-button: #EFF0F5;
--text-normal: #000000;
--text-secondary: fade(#000, 60%);
@@ -27,6 +28,14 @@
--toolbar-tab-normal:fade(#FFF, 50%);
--component-disabled-opacity: .4;
+
+ --canvas-content-background: #fff;
+
+ --active-opacity-word: fade(#446995, 30%);
+ --active-opacity-slide: fade(#AA5252, 30%);
+ --active-opacity-cell: fade(#40865C, 30%);
+
+ --image-border-types-filter: none;
}
@brand-word: var(--brand-word);
@@ -40,6 +49,7 @@
@background-secondary: var(--background-secondary);
@background-tertiary: var(--background-tertiary);
@background-menu-divider: var(--background-menu-divider);
+@background-button: var(--background-button);
@text-normal: var(--text-normal);
@text-secondary: var(--text-secondary);
@@ -50,7 +60,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/comments.less b/apps/common/mobile/resources/less/comments.less
index 40d30d9ce..9dc7945cb 100644
--- a/apps/common/mobile/resources/less/comments.less
+++ b/apps/common/mobile/resources/less/comments.less
@@ -1,5 +1,5 @@
@comment-date: #6d6d72;
-@swipe-icon: rgba(0, 0, 0, 0.12);
+@swipe-icon: #E5E5E5;
@import './ios/comments';
@import './material/comments';
@@ -9,6 +9,7 @@
.name {
font-weight: 600;
font-size: 16px;
+ color: @text-normal;
}
.wrap-textarea {
margin-top: 6px;
@@ -20,6 +21,7 @@
margin-top: 0;
height: 100%;
padding: 5px 0;
+ color: @text-normal;
}
}
}
@@ -36,7 +38,7 @@
}
.wrap-textarea {
textarea {
- color: @black;
+ color: @text-normal;
width: 100%;
}
}
@@ -75,26 +77,26 @@
.user-name {
font-size: 16px;
line-height: 22px;
- color: @black;
+ color: @text-normal;
margin: 0;
font-weight: 700;
}
.comment-date, .reply-date {
font-size: 12px;
line-height: 18px;
- color: @comment-date;
+ color: @text-secondary;
margin: 0;
}
.comment-quote {
- color: @themeColor;
- border-left: 1px solid @themeColor;
+ color: @text-secondary;
+ border-left: 1px solid @text-secondary;
padding-left: 10px;
padding-right: 16px;
margin: 5px 0;
font-size: 14px;
}
.comment-text, .reply-text {
- color: @black;
+ color: @text-normal;
font-size: 14px;
line-height: 25px;
margin: 0;
@@ -116,7 +118,7 @@
}
#view-comment-sheet {
- background-color: @white;
+ background-color: @fill-white;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
height: 45%;
@@ -130,11 +132,12 @@
display: flex;
justify-content: center;
height: 40px;
+ background-color: @background-primary;
.icon-swipe {
margin-top: 8px;
width: 40px;
height: 4px;
- background: @swipe-icon;
+ background: @background-menu-divider;
border-radius: 2px;
}
}
@@ -143,10 +146,10 @@
#view-comment-popover, #view-comment-sheet {
.toolbar {
position: fixed;
- background-color: @white;
+ background-color: @background-primary;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
.link {
- --f7-toolbar-link-color: @themeColor;
+ --f7-toolbar-link-color: @brandColor;
}
.toolbar-inner {
padding: 0 16px;
@@ -168,7 +171,7 @@
}
#view-comment-popover {
- background-color: @white;
+ background-color: @background-primary;
.pages {
position: absolute;
}
@@ -197,7 +200,7 @@
.page-current-comment {
position: relative;
.page-content {
- background-color: @white;
+ background-color: @background-primary;
}
.comment-list {
ul {
@@ -227,6 +230,7 @@
.no-comments {
text-align: center;
margin-top: 35px;
+ color: @text-normal;
}
.actions-modal.modal-in {
diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less
index 324c03a27..871ef2973 100644
--- a/apps/common/mobile/resources/less/common-ios.less
+++ b/apps/common/mobile/resources/less/common-ios.less
@@ -1,29 +1,56 @@
-.device-ios {
+.device-ios .app-layout {
@blockTitleColor: #6d6d72;
@item-border-color: #c8c7cc;
- --f7-list-item-border-color: @item-border-color;
@darkGreen: #40865c;
+ @text-normal: var(--text-normal);
- --f7-navbar-link-color: @themeColor;
- --f7-subnavbar-link-color: @themeColor;
- --f7-navbar-text-color: @black;
+ --f7-navbar-link-color: @brandColor;
+ --f7-subnavbar-link-color: @brandColor;
+ --f7-navbar-text-color: @text-normal;
--f7-navbar-title-line-height: 44px;
--f7-navbar-link-line-height: 44px;
--f7-navbar-title-font-size: 17px;
- --f7-list-bg-color: @white;
- --f7-navbar-bg-color: #f7f7f8;
+ --f7-list-bg-color: @background-primary;
+ --f7-navbar-bg-color: @toolbar-background;
- --f7-tabbar-link-inactive-color: @themeColor;
+ --f7-tabbar-link-inactive-color: @toolbar-segment;
- --f7-radio-active-color: @themeColor;
- --f7-toggle-active-color: @themeColor;
- --f7-range-bar-active-bg-color: @themeColor;
+ --f7-radio-active-color: @brandColor;
+ --f7-toggle-active-color: @brandColor;
+ --f7-range-bar-active-bg-color: @brandColor;
- --f7-list-button-text-color: @themeColor;
+ --f7-list-button-text-color: @brandColor;
- --f7-dialog-button-text-color: @themeColor;
+ --f7-list-item-border-color: @background-menu-divider;
+
+ --f7-page-bg-color: @background-tertiary;
+ --f7-list-item-title-text-color: @text-normal;
+ --f7-list-item-text-text-color: @text-normal;
+ --f7-list-item-subtitle-text-color: @text-secondary;
+ --f7-label-text-color: @text-normal;
+ --f7-list-item-after-text-color: @text-normal;
+ --f7-input-text-color: @text-normal;
+ --f7-block-title-text-color: @text-secondary;
+ --f7-input-placeholder-color: @text-secondary;
+
+ --f7-list-chevron-icon-color: @text-tertiary;
+ --f7-searchbar-search-icon-color: @text-tertiary;
+ --f7-searchbar-input-clear-button-color: @text-tertiary;
+
+ --f7-toggle-inactive-color: @background-menu-divider;
+ --f7-toggle-border-color: @background-menu-divider;
+ --f7-actions-button-border-color: @background-menu-divider;
+ --f7-popover-bg-color: @background-primary;
+ --f7-dialog-bg-color-rgb: @background-secondary;
+ --f7-dialog-title-text-color: @text-normal;
+ --f7-dialog-text-color: @text-normal;
+ --f7-dialog-button-text-color: @brandColor;
+ --f7-dialog-border-divider-color: @background-menu-divider;
+
+ --f7-subnavbar-border-color: @background-menu-divider;
+ --f7-list-border-color: @background-menu-divider;
// Main Toolbar
#editor-navbar.navbar .right a + a,
@@ -31,13 +58,14 @@
margin-left: 0;
}
- .navbar, .subnavbar {
+ .navbar, .navbar-bg, .subnavbar {
a.btn-doc-back {
width: 22px;
}
background-color: var(--f7-navbar-bg-color);
.title {
font-weight: 600;
+ color: @text-normal;
}
.navbar-inner, .subnavbar-inner {
z-index: auto;
@@ -50,6 +78,12 @@
}
}
+ .subnavbar {
+ .icon-back {
+ color: @brandColor;
+ }
+ }
+
.popover__titled {
.list {
ul {
@@ -138,6 +172,7 @@
width: 100%;
margin-top: 10px;
padding: 0 5px;
+ background: none;
}
&:first-child li:first-child, &:last-child li:last-child {
border-radius: 0;
@@ -172,7 +207,7 @@
.thumb {
width: 100%;
height: 100%;
- background-color: @white;
+ background-color: @fill-white;
background-size: cover;
label {
@@ -208,6 +243,9 @@
}
.list {
+ li {
+ color: @text-normal;
+ }
.item-content {
.color-preview {
width: 22px;
@@ -239,9 +277,11 @@
}
}
.item-inner {
+ color: @text-normal;
padding-top: 7px;
+ color: @text-normal;
.item-after {
- color: @black;
+ color: @text-normal;
.after-start {
margin: 0 5px;
}
@@ -268,6 +308,11 @@
display: flex;
align-items: center;
justify-content: center;
+ &.active {
+ color: @brandColor;
+ // background-color: var(--button-active-opacity);
+ background-color: @button-active-opacity;
+ }
}
}
}
@@ -289,7 +334,7 @@
position: relative;
overflow: hidden;
-webkit-box-flex: 1;
- border: 1px solid @themeColor;
+ border: 1px solid @toolbar-segment;
text-decoration: none;
text-align: center;
margin: 0;
@@ -302,6 +347,7 @@
cursor: pointer;
outline: 0;
font-weight: 600;
+ color: @brandColor;
&:first-child {
border-radius: 5px 0 0 5px;
border-left-width: 1px;
@@ -311,19 +357,24 @@
border-radius: 0 5px 5px 0;
}
&.tab-link-active {
- background: @themeColor;
- color: @white;
+ // background: @brandColor;
+ // color: @fill-white;
+ background: @toolbar-segment;
+ color: @brand-text-on-brand;
+ i.icon {
+ background-color: @brand-text-on-brand;
+ }
}
}
}
.button {
- border: 1px solid @themeColor;
- color: @themeColor;
+ border: 1px solid @brandColor;
+ color: @brandColor;
text-decoration: none;
text-align: center;
display: block;
- border-radius: 5px;
+ // border-radius: 5px;
line-height: 27px;
box-sizing: border-box;
background: 0 0;
@@ -339,22 +390,22 @@
cursor: pointer;
outline: 0;
&.active {
- background: @themeColor;
- color: @white;
+ background: @brandColor;
+ color: @fill-white;
i.icon {
- background-color: @white;
+ background-color: @fill-white;
}
}
}
.button-fill {
- color: @themeColor;
- background-color: @white;
+ color: @brandColor;
+ background-color: @background-primary;
}
.button-red {
- color: @red;
- background-color: @white;
+ color: @text-error;
+ background-color: @background-primary;
}
.buttons-list {
@@ -371,7 +422,7 @@
}
.button-red .list-button {
- color: red;
+ color: @text-error;
}
.list-button {
@@ -393,12 +444,12 @@
.shapes {
.page-content {
- background: @white;
+ background: @fill-white;
}
}
.dialog {
- background-color: rgba(var(--f7-dialog-bg-color-rgb), 1);
+ background-color: var(--f7-dialog-bg-color-rgb);
}
#color-picker {
@@ -424,7 +475,7 @@
.dataview, #add-table, #add-shape, #add-slide, #add-chart {
&.page-content, .page-content {
- background-color: @white;
+ background-color: @background-tertiary;
}
}
@@ -466,7 +517,7 @@
height: 28px;
}
.buttons-row-replace a {
- color: @themeColor;
+ color: @brandColor;
}
}
@@ -479,12 +530,15 @@
appearance: none;
border-radius: 5px;
font-family: inherit;
- color: @black;
+ color: @text-normal;
font-size: 14px;
font-weight: 400;
padding: 0 8px;
- background-color: @white;
+ background-color: @background-button;
padding: 0 28px;
+ &::placeholder {
+ color: @text-tertiary;
+ }
}
.searchbar-inner {
@@ -549,14 +603,15 @@
}
.actions-button {
- background: rgba(255,255,255,.95);
+ background: @background-secondary;
+ --f7-actions-button-border-color: @background-menu-divider;
}
.actions-button-text {
height: 57px;
line-height: 57px;
font-size: 20px;
- color: @themeColor;
+ color: @text-normal;
white-space: normal;
text-overflow: ellipsis;
}
@@ -588,6 +643,12 @@
padding-left: 0;
}
}
+
+ // Toggle Icon
+
+ .toggle-icon {
+ background: transparent;
+ }
}
diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less
index f2ef4e368..da9496959 100644
--- a/apps/common/mobile/resources/less/common-material.less
+++ b/apps/common/mobile/resources/less/common-material.less
@@ -1,36 +1,46 @@
-.device-android {
+.device-android .app-layout {
@tabLinkColor: rgba(255,255,255,.7);
@red: #f44336;
@white: #fff;
@darkGreen: #40865c;
@darkGrey: #757575;
+ @text-normal: var(--text-normal);
+ @brand-text-on-brand: var(--brand-text-on-brand);
@touchColor: rgba(255,255,255,0.1);
--f7-navbar-shadow-image: none;
+ --f7-theme-color: @brandColor;
- --f7-theme-color: @themeColor;
-
- --f7-navbar-bg-color: @themeColor;
- --f7-navbar-link-color: @navBarIconColor;
- --f7-navbar-text-color: @navBarIconColor;
+ --f7-navbar-bg-color: @toolbar-background;
+ --f7-navbar-link-color: @fill-white;
+ --f7-navbar-text-color: @fill-white;
--f7-navbar-height: 56px;
- --f7-subnavbar-bg-color: @themeColor;
- --f7-subnavbar-link-color: @navBarIconColor;
- --f7-subnavbar-text-color: @navBarIconColor;
+ --f7-subnavbar-bg-color: @toolbar-background;
+ --f7-subnavbar-link-color: @toolbar-icons;
+ --f7-subnavbar-text-color: @fill-white;
--f7-subnavbar-height: 56px;
- --f7-radio-active-color: @themeColor;
- --f7-toggle-active-color: @themeColor;
- --f7-range-bar-active-bg-color: @themeColor;
- --f7-range-knob-color: @themeColor;
+ --f7-radio-active-color: @brandColor;
+ --f7-toggle-active-color: @brandColor;
+ --f7-range-bar-active-bg-color: @brandColor;
+ --f7-range-knob-color: @brandColor;
--f7-range-knob-size: 16px;
--f7-link-highlight-color: transparent;
--f7-link-touch-ripple-color: @touchColor;
+ --f7-actions-bg-color: @background-secondary;
+ --f7-actions-button-border-color: @background-menu-divider;
+ --f7-popover-bg-color: @background-secondary;
+
+ --f7-dialog-bg-color: @background-secondary;
+ --f7-dialog-text-color: @text-secondary;
+ --f7-dialog-title-text-color: @text-normal;
+ --f7-dialog-button-text-color: @brandColor;
+
.button {
--f7-touch-ripple-color: transparent;
}
@@ -41,10 +51,8 @@
}
}
- --f7-input-focused-border-color: @themeColor;
- --f7-label-focused-text-color: @themeColor;
-
- --f7-dialog-button-text-color: @themeColor;
+ --f7-input-focused-border-color: @brandColor;
+ --f7-label-focused-text-color: @brandColor;
.navbar {
--f7-touch-ripple-color: @touchColor;
@@ -67,6 +75,26 @@
}
}
+ .page {
+ --f7-text-color: @text-normal;
+ --f7-list-item-title-text-color: @text-normal;
+ --f7-list-item-text-text-color: @text-normal;
+ --f7-list-item-subtitle-text-color: @text-secondary;
+ --f7-block-title-text-color: @text-secondary;
+ --f7-input-placeholder-color: @text-secondary;
+ --f7-label-text-color: @text-normal;
+ --f7-page-bg-color: @background-tertiary;
+ --f7-list-bg-color: @background-primary;
+ --f7-list-item-border-color: @background-menu-divider;
+ --f7-list-chevron-icon-color: @text-tertiary;
+ --f7-toggle-inactive-color: @background-menu-divider;
+ --f7-toggle-border-color: @background-menu-divider;
+ --f7-actions-button-text-color: @text-normal;
+ --f7-input-text-color: @text-normal;
+ --f7-subnavbar-border-color: @background-menu-divider;
+ --f7-list-border-color: @background-menu-divider;
+ }
+
.add-popup {
.view{
.block-title{
@@ -94,16 +122,19 @@
margin-left: 0;
border-radius: 0;
height: 32px;
+ i.icon-expand-down {
+ background: @brandColor;
+ }
}
label {
- color: @black;
+ color: @text-normal;
margin: 0 5px;
line-height: 32px;
}
}
.button {
- --f7-button-text-color: @themeColor;
- color: @themeColor;
+ --f7-button-text-color: @brandColor;
+ color: @brandColor;
text-align: center;
display: block;
border-radius: 2px;
@@ -131,8 +162,7 @@
}
.button-fill {
- color: @white;
- // background-color: @themeColor;
+ color: @brand-text-on-brand;
background-color: transparent;
}
@@ -141,18 +171,19 @@
}
.button-red {
- color: @white;
- background-color: @red;
+ color: @brand-text-on-brand;
+ background-color: @text-error;
}
.buttons-list {
ul {
+ background-color: @background-tertiary;
&::before, &::after {
display: none;
}
li {
margin: 20px 16px;
- color: @white;
+ color: @fill-white;
border-radius: 2px;
text-transform: uppercase;
height: 36px;
@@ -168,8 +199,8 @@
}
}
.button-fill .list-button {
- background-color: @themeColor;
- color: @white;
+ background-color: @brandColor;
+ color: @brand-text-on-brand;
height: 36px;
text-align: center;
line-height: 36px;
@@ -184,7 +215,7 @@
box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);
}
.button-red .list-button {
- background-color: @red;
+ background-color: @text-error;
}
// Tabs
.tab-buttons {
@@ -208,14 +239,15 @@
opacity: 0.5;
}
&.tab-link-active {
- color: @white;
+ color: @fill-white;
i.icon {
opacity: 1;
+ background-color: @fill-white;
}
}
}
.tab-link-highlight {
- --f7-tabbar-link-active-border-color: rgba(255,255,255,0.5);
+ --f7-tabbar-link-active-border-color: @toolbar-icons;
position: absolute;
left: 0;
bottom: 0;
@@ -224,6 +256,12 @@
}
// List
.list {
+ li {
+ color: @text-normal;
+ }
+ .item-inner {
+ color: @text-normal;
+ }
li.no-indicator {
.item-link {
.item-inner{
@@ -237,7 +275,7 @@
.item-link {
.item-inner {
.item-after {
- color: @black;
+ color: @text-normal;
}
}
}
@@ -280,11 +318,12 @@
margin-left: 0;
}
&.active {
- color: @white;
- background-color: @themeColor;
- i.icon {
- background-color: @white;
- }
+ color: @brandColor;
+ // background-color: var(--button-active-opacity);
+ background-color: @button-active-opacity;
+ // i.icon {
+ // background-color: @white;
+ // }
}
}
}
@@ -298,6 +337,7 @@
border-radius: 4px;
margin-top: -3px;
box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
+ background: @fill-white;
&.auto {
background-color: @autoColor;
}
@@ -311,6 +351,7 @@
.list{
margin: 5px;
ul {
+ background: none;
&:before, &:after {
display: none;
}
@@ -350,7 +391,7 @@
.thumb {
width: 100%;
height: 100%;
- background-color: @white;
+ background-color: @fill-white;
background-size: cover;
label {
@@ -377,7 +418,7 @@
#color-picker {
.right-block {
.button-round {
- background-color: @themeColor;
+ background-color: @brandColor;
}
}
}
@@ -429,7 +470,7 @@
height: 18px;
margin-top: -8px;
&:after {
- color: @white;
+ color: @fill-white;
font-size: 19px;
line-height: 19px;
}
@@ -437,7 +478,7 @@
.searchbar-icon {
&:after {
- color: @white;
+ color: @fill-white;
font-size: 19px;
}
}
@@ -450,11 +491,11 @@
appearance: none;
border-radius: 0;
font-family: inherit;
- color: @white;
+ color: @fill-white;
font-size: 16px;
font-weight: 400;
padding: 0;
- border-bottom: 1px solid @white;
+ border-bottom: 1px solid @fill-white;
height: 100%;
padding: 0 36px 0 24px;
background-color: transparent;
@@ -467,7 +508,7 @@
}
.searchbar input[type=search]::placeholder {
- color: @white;
+ color: @fill-white;
}
.navbar {
@@ -490,12 +531,17 @@
a.link {
padding: 0 16px;
}
+ a.link.searchbar-enable {
+ i.icon-search {
+ background-color: @toolbar-icons;
+ }
+ }
a.icon-only {
width: auto;
height: 56px;
}
.buttons-row-replace a {
- color: @white;
+ color: @fill-white;
padding: 0;
}
.searchbar .buttons-row {
@@ -517,7 +563,9 @@
cursor: pointer;
line-height: 48px;
font-size: 16px;
- color: rgba(0,0,0,.87);
+ // color: rgba(0,0,0,.87);
+ color: @text-normal;
+ // color: var(--f7-actions-button-text-color, );
}
@media (min-width: 496px) {
diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index 8806ec6f1..d1d3b0c81 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -48,6 +48,9 @@
.subnavbar-inner {
padding: 0;
}
+ .icon-back {
+ color: @toolbar-icons;
+ }
}
.page.page-with-subnavbar {
@@ -92,6 +95,9 @@
max-height: initial;
-webkit-line-clamp: initial;
}
+ .font-item img {
+ filter: var(--image-border-types-filter, none)
+ }
}
.shapes {
@@ -103,7 +109,7 @@
.thumb {
width: 100%;
height: 100%;
- background-color: @themeColor;
+ background-color: @brandColor;
}
}
}
@@ -149,7 +155,7 @@
.content-block {
margin: 0 auto 15px;
a {
- color: @black;
+ color: @text-normal;
}
}
}
@@ -166,7 +172,7 @@
.color-schemes-menu {
cursor: pointer;
display: block;
- background-color: @white;
+ // background-color: @white;
.item-inner {
justify-content: flex-start;
}
@@ -181,7 +187,7 @@
}
.item-title {
margin-left: 20px;
- color: #212121;
+ color: @text-normal;
}
}
@@ -224,7 +230,7 @@
bottom: 0;
z-index: 1;
background-repeat: no-repeat;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
.active .item-inner:before {
opacity: 1;
@@ -268,7 +274,7 @@
right: -5px;
bottom: -5px;
z-index: 1;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
@@ -379,7 +385,7 @@
}
&.active {
.color-auto {
- box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
+ box-shadow: 0 0 0 1px @white, 0 0 0 4px @brandColor;
border-radius: 1px;
}
}
@@ -404,7 +410,7 @@
position: absolute;
width: 100%;
height: 100%;
- box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
+ box-shadow: 0 0 0 1px @white, 0 0 0 4px @brandColor;
z-index: 1;
border-radius: 1px;
}
@@ -422,6 +428,7 @@
}
.list .item-inner {
display: block;
+ color: var(--text-normal);
}
.standart-colors, .dynamic-colors {
.palette {
@@ -480,7 +487,7 @@
justify-content: center;
align-items: center;
border-radius: 100px;
- background-color: @white;
+ background-color: @fill-white;
box-shadow: 0 4px 4px rgba(0,0,0,.25);
// border-color: transparent;
border: 0;
@@ -557,6 +564,7 @@
height: 100%;
padding: 0;
background-size: contain;
+ background-color: var(--canvas-content-background);
}
}
}
diff --git a/apps/common/mobile/resources/less/dataview.less b/apps/common/mobile/resources/less/dataview.less
index 104d04836..8ca304ead 100644
--- a/apps/common/mobile/resources/less/dataview.less
+++ b/apps/common/mobile/resources/less/dataview.less
@@ -25,7 +25,7 @@
height: 22px;
right: -5px;
bottom: -5px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
}
}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/icons.less b/apps/common/mobile/resources/less/icons.less
index 638f99f5e..ac7a718c2 100644
--- a/apps/common/mobile/resources/less/icons.less
+++ b/apps/common/mobile/resources/less/icons.less
@@ -5,17 +5,17 @@ i.icon {
&.icon-paste {
width: 24px;
height: 24px;
- .encoded-svg-uncolored-mask('');
+ .encoded-svg-mask('', @text-normal);
}
&.icon-copy {
width: 24px;
height: 24px;
- .encoded-svg-uncolored-mask('');
+ .encoded-svg-mask('', @text-normal);
}
&.icon-cut {
width: 24px;
height: 24px;
- .encoded-svg-uncolored-mask('');
+ .encoded-svg-mask('', @text-normal);
}
&.icon-prev:after, &.icon-next:after {
content: none;
@@ -23,11 +23,11 @@ i.icon {
&.icon-collaboration {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-cancellation {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
}
diff --git a/apps/common/mobile/resources/less/ios/_collaboration.less b/apps/common/mobile/resources/less/ios/_collaboration.less
index d958e12f4..e55a265a7 100644
--- a/apps/common/mobile/resources/less/ios/_collaboration.less
+++ b/apps/common/mobile/resources/less/ios/_collaboration.less
@@ -1,7 +1,7 @@
.page-change {
- background-color: #FFFFFF;
+ background-color: @fill-white;
.block-description {
- background-color: #fff;
+ background-color: @fill-white;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
@@ -11,18 +11,18 @@
#user-name {
font-size: 17px;
line-height: 22px;
- color: #000000;
+ color: @fill-black;
margin: 0;
}
#date-change {
font-size: 14px;
line-height: 18px;
- color: #6d6d72;
+ color: @text-tertiary;
margin: 0;
margin-top: 3px;
}
#text-change {
- color: #000000;
+ color: @fill-black;
font-size: 15px;
line-height: 20px;
margin: 0;
@@ -155,19 +155,19 @@
.user-name {
font-size: 17px;
line-height: 22px;
- color: #000000;
+ color: @fill-black;
margin: 0;
font-weight: bold;
}
.comment-date, .reply-date {
font-size: 13px;
line-height: 18px;
- color: #6d6d72;
+ color: @text-secondary;
margin: 0;
margin-top: 0px;
}
.comment-text, .reply-text {
- color: #000000;
+ color: @fill-black;
font-size: 15px;
line-height: 25px;
margin: 0;
@@ -205,8 +205,8 @@
}
}
.comment-quote {
- color: @themeColor;
- border-left: 1px solid @themeColor;
+ color: @text-secondary;
+ border-left: 1px solid @text-secondary;
padding-left: 10px;
padding-right: 16px;
margin: 5px 0;
@@ -233,7 +233,7 @@
.container-edit-comment {
.page {
- background-color: #FFFFFF;
+ background-color: @fill-white;
}
}
@@ -380,10 +380,10 @@
}
#done-comment {
- color: @themeColor;
+ color: @brandColor;
}
.page-add-comment {
- background-color: #FFFFFF;
+ background-color: @fill-white;
.wrap-comment, .wrap-reply {
padding: 16px 24px 0 16px;
.header-comment {
@@ -396,7 +396,7 @@
}
.comment-date {
font-size: 13px;
- color: #6d6d72;
+ color: @text-secondary;
padding-left: 5px;
}
.wrap-textarea {
diff --git a/apps/common/mobile/resources/less/ios/_color-palette.less b/apps/common/mobile/resources/less/ios/_color-palette.less
index 9e868c0c1..b9c504f21 100644
--- a/apps/common/mobile/resources/less/ios/_color-palette.less
+++ b/apps/common/mobile/resources/less/ios/_color-palette.less
@@ -15,7 +15,7 @@
position: absolute;
width: 100%;
height: 100%;
- box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
+ box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
z-index: 1;
border-radius: 1px;
}
@@ -166,6 +166,6 @@
}
#font-color-auto.active .color-auto {
- box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
+ box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
border-radius: 1px;
}
diff --git a/apps/common/mobile/resources/less/ios/_dataview.less b/apps/common/mobile/resources/less/ios/_dataview.less
index 92b849b43..6ddb04406 100644
--- a/apps/common/mobile/resources/less/ios/_dataview.less
+++ b/apps/common/mobile/resources/less/ios/_dataview.less
@@ -29,7 +29,7 @@
height: 22px;
right: -5px;
bottom: -5px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
}
}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/ios/_listview.less b/apps/common/mobile/resources/less/ios/_listview.less
index c1ea628bd..9a5d40fe5 100644
--- a/apps/common/mobile/resources/less/ios/_listview.less
+++ b/apps/common/mobile/resources/less/ios/_listview.less
@@ -24,10 +24,10 @@
}
input.field {
- color: @themeColor;
+ color: @brandColor;
&.placeholder-color::-webkit-input-placeholder {
- color: @themeColor;
+ color: @brandColor;
}
&.right {
@@ -88,6 +88,6 @@
.list-block {
.item-link.list-button {
- color: @themeColor;
+ color: @brandColor;
}
}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/ios/comments.less b/apps/common/mobile/resources/less/ios/comments.less
index a00df23c6..cde7c1f88 100644
--- a/apps/common/mobile/resources/less/ios/comments.less
+++ b/apps/common/mobile/resources/less/ios/comments.less
@@ -1,6 +1,10 @@
.device-ios {
.wrap-comment {
height: calc(100% - 60px);
+ background-color: @background-tertiary;
+ .comment-date {
+ color: @text-secondary;
+ }
}
.add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog {
.wrap-textarea {
diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less
index 401956832..0456b303c 100644
--- a/apps/common/mobile/resources/less/ios/icons.less
+++ b/apps/common/mobile/resources/less/ios/icons.less
@@ -1,6 +1,13 @@
// @common-image-header-path - defined in webpack config
.device-ios {
+ .theme-type-dark {
+ i.icon {
+ &.icon-logo {
+ background: ~"url(@{common-image-header-path}/logo-android.svg)" no-repeat center;
+ }
+ }
+ }
i.icon {
&.icon_mask {
background-color: white;
@@ -13,7 +20,7 @@
&.icon-prev {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
&:after {
display: none;
}
@@ -21,7 +28,7 @@
&.icon-next {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
&:after {
display: none;
}
@@ -29,7 +36,7 @@
&.icon-edit {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
}
diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less
index 58fe43f98..2d89a7280 100644
--- a/apps/common/mobile/resources/less/material/_collaboration.less
+++ b/apps/common/mobile/resources/less/material/_collaboration.less
@@ -1,6 +1,6 @@
.page-change {
.block-description {
- background-color: #fff;
+ background-color: @fill-white;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
@@ -10,18 +10,18 @@
#user-name {
font-size: 16px;
line-height: 22px;
- color: #000000;
+ color: @fill-black;
margin: 0;
}
#date-change {
font-size: 14px;
line-height: 18px;
- color: #6d6d72;
+ color: @text-tertiary;
margin: 0;
margin-top: 3px;
}
#text-change {
- color: #000000;
+ color: @fill-black;
font-size: 15px;
line-height: 20px;
margin: 0;
@@ -152,18 +152,18 @@
.user-name {
font-size: 16px;
line-height: 22px;
- color: #000000;
+ color: @fill-black;
margin: 0;
}
.comment-date, .reply-date {
font-size: 12px;
line-height: 18px;
- color: #6d6d72;
+ color: @text-secondary;
margin: 0;
margin-top: 0px;
}
.comment-text, .reply-text {
- color: #000000;
+ color: @fill-black;
font-size: 15px;
line-height: 25px;
margin: 0;
@@ -185,8 +185,8 @@
}
}
.comment-quote {
- color: @themeColor;
- border-left: 1px solid @themeColor;
+ color: @text-secondary;
+ border-left: 1px solid @text-secondary;
padding-left: 10px;
padding-right: 16px;
margin: 5px 0;
@@ -291,7 +291,7 @@
}
a {
&.link {
- color: @themeColor;
+ color: @brandColor;
font-size: 16px;
}
}
@@ -316,6 +316,7 @@
display: flex;
justify-content: center;
height: 40px;
+ background-color: @background-primary;
.icon-swipe {
margin-top: 8px;
width: 40px;
@@ -419,7 +420,7 @@
}
.comment-date {
font-size: 13px;
- color: #6d6d72;
+ color: @text-secondary;
}
.wrap-textarea {
margin-top: 16px;
@@ -471,7 +472,7 @@
}
}
.page-add-comment {
- background-color: #FFFFFF;
+ background-color: @fill-white;
}
.header-comment {
justify-content: flex-start;
@@ -483,7 +484,7 @@
}
.page-edit-comment, .page-add-reply, .page-edit-reply {
- background-color: #FFFFFF;
+ background-color: @fill-white;
.header-comment {
justify-content: flex-start;
}
diff --git a/apps/common/mobile/resources/less/material/_color-palette.less b/apps/common/mobile/resources/less/material/_color-palette.less
index c6284cf79..ab77c10a0 100644
--- a/apps/common/mobile/resources/less/material/_color-palette.less
+++ b/apps/common/mobile/resources/less/material/_color-palette.less
@@ -15,7 +15,7 @@
position: absolute;
width: 100%;
height: 100%;
- box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
+ box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
z-index: 1;
border-radius: 1px;
}
@@ -71,7 +71,7 @@
justify-content: center;
align-items: center;
border-radius: 100px;
- background-color: @themeColor;
+ background-color: @brandColor;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-color: transparent;
margin-top: 25px;
@@ -170,6 +170,6 @@
}
}
#font-color-auto.active .color-auto {
- box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
+ box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
border-radius: 1px;
}
diff --git a/apps/common/mobile/resources/less/material/_dataview.less b/apps/common/mobile/resources/less/material/_dataview.less
index 2c93fe576..fca18dbd7 100644
--- a/apps/common/mobile/resources/less/material/_dataview.less
+++ b/apps/common/mobile/resources/less/material/_dataview.less
@@ -26,7 +26,7 @@
height: 22px;
right: -5px;
bottom: -5px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
}
}
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/material/_listview.less b/apps/common/mobile/resources/less/material/_listview.less
index b352e3225..ba134cc39 100644
--- a/apps/common/mobile/resources/less/material/_listview.less
+++ b/apps/common/mobile/resources/less/material/_listview.less
@@ -43,7 +43,7 @@
&.active {
color: #fff;
- background-color: @themeColor;
+ background-color: @brandColor;
}
}
}
diff --git a/apps/common/mobile/resources/less/material/_sailfish_fix.less b/apps/common/mobile/resources/less/material/_sailfish_fix.less
index 71403062c..fa6985cfb 100644
--- a/apps/common/mobile/resources/less/material/_sailfish_fix.less
+++ b/apps/common/mobile/resources/less/material/_sailfish_fix.less
@@ -22,18 +22,18 @@
.sailfish {
- .icon-redefine(icon-text-align-center, '');
- .icon-redefine(icon-text-align-jast, '');
- .icon-redefine(icon-text-align-left, '');
- .icon-redefine(icon-text-align-right, '');
- .icon-redefine(icon-de-indent, '');
- .icon-redefine(icon-in-indent, '');
- .icon-redefine(icon-block-align-left, '');
- .icon-redefine(icon-block-align-center, '');
- .icon-redefine(icon-block-align-right, '');
- .icon-redefine(icon-text-valign-top, '');
- .icon-redefine(icon-text-valign-middle, '');
- .icon-redefine(icon-text-valign-bottom,'');
+ .icon-redefine(icon-text-align-center, '');
+ .icon-redefine(icon-text-align-jast, '');
+ .icon-redefine(icon-text-align-left, '');
+ .icon-redefine(icon-text-align-right, '');
+ .icon-redefine(icon-de-indent, '');
+ .icon-redefine(icon-in-indent, '');
+ .icon-redefine(icon-block-align-left, '');
+ .icon-redefine(icon-block-align-center, '');
+ .icon-redefine(icon-block-align-right, '');
+ .icon-redefine(icon-text-valign-top, '');
+ .icon-redefine(icon-text-valign-middle, '');
+ .icon-redefine(icon-text-valign-bottom,'');
.item-content.buttons .item-inner > .row .button.active {
background-color: @themeColorLight;
diff --git a/apps/common/mobile/resources/less/material/comments.less b/apps/common/mobile/resources/less/material/comments.less
index 92616d7c2..98bd8ec3a 100644
--- a/apps/common/mobile/resources/less/material/comments.less
+++ b/apps/common/mobile/resources/less/material/comments.less
@@ -1,6 +1,10 @@
.device-android {
.wrap-comment {
height: calc(100% - 72px);
+ background-color: @background-tertiary;
+ .comment-date {
+ color: @text-secondary;
+ }
}
.add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog {
.wrap-textarea {
@@ -17,7 +21,7 @@
display: flex;
.initials {
border-radius: 50px;
- color: @white;
+ color: @fill-white;
display: flex;
justify-content: center;
align-items: center;
diff --git a/apps/common/mobile/resources/less/material/contextmenu.less b/apps/common/mobile/resources/less/material/contextmenu.less
index 95476f42a..a1a6a9daa 100644
--- a/apps/common/mobile/resources/less/material/contextmenu.less
+++ b/apps/common/mobile/resources/less/material/contextmenu.less
@@ -19,7 +19,7 @@
}
.list-button {
- color: #212121;
+ color: @text-normal;
}
//.item-link {
diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less
index 53577e587..6768ae033 100644
--- a/apps/common/mobile/resources/less/material/icons.less
+++ b/apps/common/mobile/resources/less/material/icons.less
@@ -3,7 +3,7 @@
.device-android {
i.icon {
&.icon_mask {
- background-color: black;
+ background-color: @text-normal;
}
&.icon-logo {
width: 100px;
@@ -13,7 +13,7 @@
&.icon-prev {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
&:after {
display: none;
}
@@ -21,7 +21,7 @@
&.icon-next {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
&:after {
display: none;
}
@@ -32,12 +32,12 @@
&.icon-collaboration {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-edit {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
}
diff --git a/apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx
index c3f823e0c..98f516d09 100644
--- a/apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx
+++ b/apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx
@@ -2,6 +2,7 @@ import React, { Component } from "react";
import { ApplicationSettings } from "../../view/settings/ApplicationSettings";
import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
import {observer, inject} from "mobx-react";
+import { Themes } from '../../../../../common/mobile/lib/controller/Themes.js';
class ApplicationSettingsController extends Component {
constructor(props) {
@@ -24,20 +25,6 @@ class ApplicationSettingsController extends Component {
Common.EditorApi.get().asc_setSpellCheck(value);
}
- switchDarkTheme(value) {
- const theme = value ? {id:'theme-dark', type:'dark'} : {id:'theme-light', type:'light'};
- LocalStorage.setItem("ui-theme", JSON.stringify(theme));
-
- const $body = $$('body');
- $body.attr('class') && $body.attr('class', $body.attr('class').replace(/\s?theme-type-(?:dark|light)/, ''));
- $body.addClass(`theme-type-${theme.type}`);
- }
-
- isThemeDark() {
- const obj = LocalStorage.getItem("ui-theme");
- return !!obj ? JSON.parse(obj).type === 'dark' : false;
- }
-
switchNoCharacters(value) {
LocalStorage.setBool("de-mobile-no-characters", value);
Common.EditorApi.get().put_ShowParaMarks(value);
@@ -81,13 +68,11 @@ class ApplicationSettingsController extends Component {
)
}
diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less
index 5fb8ff040..d8f784511 100644
--- a/apps/documenteditor/mobile/src/less/app-ios.less
+++ b/apps/documenteditor/mobile/src/less/app-ios.less
@@ -1,7 +1,7 @@
.ios {
.view {
.bullets-numbers{
- background: #fff;
+ background: @brand-text-on-brand;
}
}
@@ -45,7 +45,7 @@
.color-schemes-menu {
cursor: pointer;
display: block;
- background-color: #fff;
+ // background-color: #fff;
.item-inner {
justify-content: flex-start;
}
@@ -60,7 +60,7 @@
}
.item-title {
margin-left: 20px;
- color: #212121;
+ // color: #212121;
}
}
diff --git a/apps/documenteditor/mobile/src/less/app-material.less b/apps/documenteditor/mobile/src/less/app-material.less
index b40c69124..0182800f7 100644
--- a/apps/documenteditor/mobile/src/less/app-material.less
+++ b/apps/documenteditor/mobile/src/less/app-material.less
@@ -1,7 +1,7 @@
// Colors
@themeColorLight: #a2bdde;
-@navBarIconColor: #fff;
+@navBarIconColor: @toolbar-icons;
.device-android {
@@ -93,7 +93,7 @@
.color-schemes-menu {
cursor: pointer;
display: block;
- background-color: #fff;
+ // background-color: #fff;
.item-inner {
justify-content: flex-start;
}
@@ -108,6 +108,6 @@
}
.item-title {
margin-left: 20px;
- color: #212121;
+ // color: #212121;
}
}
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less
index 887ff250f..a4c192194 100644
--- a/apps/documenteditor/mobile/src/less/app.less
+++ b/apps/documenteditor/mobile/src/less/app.less
@@ -1,10 +1,29 @@
-@themeColor: #446995;
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
@import '../../../../common/mobile/resources/less/_mixins.less';
@import '../../../../common/mobile/resources/less/colors-table.less';
@import '../../../../common/mobile/resources/less/colors-table-dark.less';
+@brandColor: var(--brand-word);
+
+.device-ios {
+ --toolbar-background: var(--background-primary, #FFF);
+ --toolbar-segment: var(--brand-word, #446995);
+ --toolbar-icons: var(--brand-word, #446995);
+}
+
+.device-android {
+ --toolbar-background: var(--brand-word, #446995);
+
+ .theme-type-dark {
+ --toolbar-icons: var(--brand-word, #446995);
+ }
+}
+
+@toolbar-background: var(--toolbar-background);
+@toolbar-segment: var(--toolbar-segment);
+@button-active-opacity: var(--active-opacity-word);
+
@import '../../../../common/mobile/resources/less/collaboration.less';
@import '../../../../common/mobile/resources/less/common.less';
@import '../../../../common/mobile/resources/less/common-ios.less';
@@ -48,9 +67,9 @@
// Review
.page-review {
- --f7-toolbar-link-color: @themeColor;
+ --f7-toolbar-link-color: @brandColor;
.toolbar {
- background-color: @white;
+ background-color: @background-secondary;
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.2);
position: absolute;
#btn-reject-change {
@@ -66,27 +85,28 @@
}
}
.page-content {
- background-color: @white;
+ // background-color: @white;
.no-changes {
padding: 15px;
+ color: @text-normal;
}
.block-description {
padding: 15px;
.user-name {
font-size: 17px;
line-height: 22px;
- color: @black;
+ color: @text-normal;
margin: 0;
}
.date-change {
font-size: 14px;
line-height: 18px;
- color: @darkGray;
+ color: @text-secondary;
margin: 0;
margin-top: 3px;
}
.text {
- color: @black;
+ color: @text-normal;
font-size: 15px;
line-height: 20px;
margin: 0;
diff --git a/apps/documenteditor/mobile/src/less/icons-ios.less b/apps/documenteditor/mobile/src/less/icons-ios.less
index 05960f7e5..99205059b 100644
--- a/apps/documenteditor/mobile/src/less/icons-ios.less
+++ b/apps/documenteditor/mobile/src/less/icons-ios.less
@@ -3,83 +3,83 @@
&.icon-undo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-redo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-expand-down {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//Settings
&.icon-spellcheck {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reader {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-doc-setup {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-app-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-download {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-print {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-info {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-help {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-about {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Download
@@ -87,55 +87,55 @@
&.icon-format-docx {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-pdf {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-pdfa {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-txt {
width: 24px;
height: 24px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-rtf {
width: 24px;
height: 24px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-odt {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-html {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-dotx {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-ott {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
@@ -143,234 +143,234 @@
&.icon-text-additional {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-bullets {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-numbers {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-linespacing {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-color {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-selection {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Align
&.icon-text-align-left {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-right {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-center {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-just {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-de-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-in-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Table
&.icon-table-add-column-left {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-column-right {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-above {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-below {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-column {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-row {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Presets of table borders
&.icon-table-borders-all {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-none {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-inner {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-outer {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-left {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-center {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-right {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-top {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-middle {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-bottom {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Reorder
&.icon-move-backward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-forward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
- &.icon-move-background {
+ &.icon-move-mask {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-foreground {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Wrap
&.icon-wrap-inline {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-wrap-square {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-wrap-tight {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-wrap-through {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-wrap-top-bottom {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-wrap-infront {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-wrap-behind {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Table Wrap
&.icon-wrap-table-inline {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-wrap-table-flow {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-block-align-left {
width: 28px;
height: 28px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-block-align-center {
width: 28px;
height: 28px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-block-align-right {
width: 28px;
height: 28px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Insert link/image-library
&.icon-link {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-image-library {
width: 22px;
@@ -381,126 +381,126 @@
&.icon-add-table {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-segment);
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('',@toolbar-segment);
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-segment);
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-segment);
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagenumber {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-sectionbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-footnote {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagebreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-stringbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Collaboration
&.icon-users {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-review {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-review-changes {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-accept-changes {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reject-changes {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-accept {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reject {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-next-change {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-prev-change {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-goto {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Comments
&.icon-menu-comment {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-resolve-comment.check {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
.tab-link-active {
@@ -508,22 +508,22 @@
&.icon-add-table {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
}
diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less
index 03e09345e..bc3b9c640 100644
--- a/apps/documenteditor/mobile/src/less/icons-material.less
+++ b/apps/documenteditor/mobile/src/less/icons-material.less
@@ -4,68 +4,68 @@
&.icon-undo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-redo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-prev {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-next {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-expand-down {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
// Insert
&.icon-add-table {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-tab-normal);
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-tab-normal);
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-tab-normal);
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-tab-normal);
}
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
}
@@ -73,68 +73,68 @@
&.icon-plus {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
&.icon-expand-down {
width: 17px;
height: 17px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
&.icon-expand-up {
width: 17px;
height: 17px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//Settings
&.icon-spellcheck {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reader {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-doc-setup {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-app-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-download {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-print {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-info {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-help {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-about {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Download
@@ -142,55 +142,55 @@
&.icon-format-docx {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-pdf {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-pdfa {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-txt {
width: 24px;
height: 24px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-rtf {
width: 24px;
height: 24px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-odt {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-html {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-dotx {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
&.icon-format-ott {
width: 30px;
height: 30px;
- .encoded-svg-background('')
+ .encoded-svg-mask('')
}
@@ -199,276 +199,276 @@
&.icon-text-align-left {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-right {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-center {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-just {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-de-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-in-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Table
&.icon-table-add-column-left {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-column-right {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-above {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-below {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-column {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-row {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Presets of table borders
&.icon-table-borders-all {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-none {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-inner {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-outer {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-left {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-center {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-right {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-top {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-middle {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-bottom {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Reorder
&.icon-move-backward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-forward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
- &.icon-move-background {
+ &.icon-move-mask {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-foreground {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Table Wrap
&.icon-block-align-left {
width: 28px;
height: 28px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-block-align-center {
width: 28px;
height: 28px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-block-align-right {
width: 28px;
height: 28px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Insert link/image-library
&.icon-link {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-image-library {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagenumber {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-sectionbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-footnote {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagebreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-stringbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Collaboration
&.icon-users {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-review {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-review-changes {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-accept-changes {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reject-changes {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-accept {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reject {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-next-change {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-prev-change {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-goto {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Comments
&.icon-menu-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-resolve-comment.check {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
&.icon-done-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-done-comment-white {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
}
}
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/src/view/app.jsx b/apps/documenteditor/mobile/src/view/app.jsx
index b114f32d5..02821f8a5 100644
--- a/apps/documenteditor/mobile/src/view/app.jsx
+++ b/apps/documenteditor/mobile/src/view/app.jsx
@@ -30,7 +30,7 @@ export default class extends React.Component {
render() {
return (
-
+
{/* Your main view, should have "view-main" class */}
diff --git a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx
index 7d696d813..a9500b69c 100644
--- a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx
@@ -2,6 +2,7 @@ import React, {Fragment, useState} from "react";
import { observer, inject } from "mobx-react";
import { Page, Navbar, List, ListItem, BlockTitle, Toggle } from "framework7-react";
import { useTranslation } from "react-i18next";
+import { Themes } from '../../../../../common/mobile/lib/controller/Themes.js';
const PageApplicationSettings = props => {
const { t } = useTranslation();
@@ -14,7 +15,7 @@ const PageApplicationSettings = props => {
const isHiddenTableBorders = store.isHiddenTableBorders;
const isComments = store.isComments;
const isResolvedComments = store.isResolvedComments;
- const [isThemeDark, setIsThemeDark] = useState(props.isThemeDark);
+ const [isThemeDark, setIsThemeDark] = useState(Themes.isCurrentDark);
const changeMeasureSettings = value => {
store.changeUnitMeasurement(value);
@@ -51,7 +52,7 @@ const PageApplicationSettings = props => {
{props.switchDarkTheme(!toggle), setIsThemeDark(!toggle)}}>
+ onToggleChange={toggle => {Themes.switchDarkTheme(!toggle), setIsThemeDark(!toggle)}}>
diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json
index 6cc90a707..1ea925633 100644
--- a/apps/presentationeditor/mobile/locale/en.json
+++ b/apps/presentationeditor/mobile/locale/en.json
@@ -466,7 +466,8 @@
"txtScheme6": "Concourse",
"txtScheme7": "Equity",
"txtScheme8": "Flow",
- "txtScheme9": "Foundry"
+ "txtScheme9": "Foundry",
+ "textDarkTheme": "Dark Theme"
}
}
}
\ No newline at end of file
diff --git a/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx
index fce2d7d05..93428d9e9 100644
--- a/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx
+++ b/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx
@@ -2,6 +2,7 @@ import React, { Component } from "react";
import { ApplicationSettings } from "../../view/settings/ApplicationSettings";
import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
import {observer, inject} from "mobx-react";
+import { Themes } from '../../../../../common/mobile/lib/controller/Themes.js';
class ApplicationSettingsController extends Component {
constructor(props) {
@@ -26,13 +27,12 @@ class ApplicationSettingsController extends Component {
LocalStorage.setItem("pe-mobile-macros-mode", value);
}
-
render() {
return (
)
}
diff --git a/apps/presentationeditor/mobile/src/less/app-ios.less b/apps/presentationeditor/mobile/src/less/app-ios.less
index 71f59edee..84d3fca96 100644
--- a/apps/presentationeditor/mobile/src/less/app-ios.less
+++ b/apps/presentationeditor/mobile/src/less/app-ios.less
@@ -1,7 +1,7 @@
.device-ios {
.view {
.page-content{
- background: #fff;
+ background: @background-tertiary;
}
}
}
diff --git a/apps/presentationeditor/mobile/src/less/app-material.less b/apps/presentationeditor/mobile/src/less/app-material.less
index 82d6f5c70..a76684757 100644
--- a/apps/presentationeditor/mobile/src/less/app-material.less
+++ b/apps/presentationeditor/mobile/src/less/app-material.less
@@ -5,9 +5,9 @@
.device-android {
- --f7-navbar-bg-color: @themeColor;
- --f7-navbar-link-color: @navBarIconColor;
- --f7-navbar-text-color: @navBarIconColor;
+ --f7-navbar-bg-color: @brandColor;
+ --f7-navbar-link-color: @text-link;
+ --f7-navbar-text-color: @text-normal;
// Main Toolbar
#editor-navbar.navbar .right {
diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less
index 549cb860b..2c4ed09f5 100644
--- a/apps/presentationeditor/mobile/src/less/app.less
+++ b/apps/presentationeditor/mobile/src/less/app.less
@@ -1,10 +1,27 @@
-@themeColor: #aa5252;
-
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
-
@import '../../../../common/mobile/resources/less/_mixins.less';
@import '../../../../common/mobile/resources/less/colors-table.less';
@import '../../../../common/mobile/resources/less/colors-table-dark.less';
+
+@brandColor: var(--brand-slide);
+
+.device-ios {
+ --toolbar-background: var(--background-primary, #fff);
+ --toolbar-segment: var(--brand-slide, #aa5252);
+ --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);
+@toolbar-segment: var(--toolbar-segment);
+@button-active-opacity: var(--active-opacity-slide);
+
@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 a24403d20..3c7a619c5 100644
--- a/apps/presentationeditor/mobile/src/less/icons-ios.less
+++ b/apps/presentationeditor/mobile/src/less/icons-ios.less
@@ -4,247 +4,247 @@
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-burger {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-play {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-undo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-redo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reader {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-download {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-print {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-spellcheck {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-info {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-about {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-help {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-setup {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-versions {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-additional {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-color {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-selection {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-bullets {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-numbers {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-linespacing {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-align-center {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-just {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-left {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-right {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-de-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-in-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-table-add-column-left {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-column-right {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-above {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-below {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-column {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-row {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-expand-down {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagebreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-sectionbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-stringbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagenumber {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-link {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-image-library {
@@ -256,19 +256,19 @@
&.icon-text-valign-top {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-middle {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-bottom {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Presets of table borders
@@ -276,61 +276,61 @@
&.icon-table-borders-all {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-none {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-inner {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-outer {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-left {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-center {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-right {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-top {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-middle {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-bottom {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Reorder
@@ -338,73 +338,73 @@
&.icon-move-backward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-forward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-background {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-foreground {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-left {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-center {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-right {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-top {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-middle {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-bottom {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-horizontal {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-vertical {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Formats
@@ -412,106 +412,106 @@
&.icon-format-pdf {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-pdfa {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-pptx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-potx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-odp {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-otp {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('')
}
// Collaboration
&.icon-users {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-app-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//comments
&.icon-menu-comment {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-resolve-comment.check {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//Insert
&.icon-add-slide {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-table {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
@@ -520,25 +520,25 @@
&.icon-add-slide {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
}
}
diff --git a/apps/presentationeditor/mobile/src/less/icons-material.less b/apps/presentationeditor/mobile/src/less/icons-material.less
index 90ffdba25..23488b3a3 100644
--- a/apps/presentationeditor/mobile/src/less/icons-material.less
+++ b/apps/presentationeditor/mobile/src/less/icons-material.less
@@ -4,241 +4,241 @@
&.icon-expand-up {
width: 17px;
height: 17px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-expand-down {
width: 17px;
height: 17px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-edit {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-play {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-reader {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-download {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-print {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-spellcheck {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-info {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-about {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-help {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-setup {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-versions {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//&.icon-text-additional {
// width: 22px;
// height: 22px;
- // .encoded-svg-background('');
+ // .encoded-svg-mask('');
//}
//&.icon-text-color {
// width: 22px;
// height: 22px;
- // .encoded-svg-background('');
+ // .encoded-svg-mask('');
//}
//&.icon-text-selection {
// width: 22px;
// height: 22px;
- // .encoded-svg-background('');
+ // .encoded-svg-mask('');
//}
//&.icon-bullets {
// width: 22px;
// height: 22px;
- // .encoded-svg-background('');
+ // .encoded-svg-mask('');
//}
//&.icon-numbers {
// width: 22px;
// height: 22px;
- // .encoded-svg-background('');
+ // .encoded-svg-mask('');
//}
//&.icon-linespacing {
// width: 22px;
// height: 22px;
- // .encoded-svg-background('');
+ // .encoded-svg-mask('');
//}
&.icon-text-align-center {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-just {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-left {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-right {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-de-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-in-indent {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-table-add-column-left {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-column-right {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-above {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-add-row-below {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-column {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-remove-row {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagebreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-sectionbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-stringbreak {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-pagenumber {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-image-library {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-top {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-middle {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-bottom {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Presets of table borders
@@ -246,61 +246,61 @@
&.icon-table-borders-all {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-none {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-inner {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-outer {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-left {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-center {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-right {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-top {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-middle {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-bottom {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Reorder
@@ -308,73 +308,73 @@
&.icon-move-backward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-forward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-background {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-foreground {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-left {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-center {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-right {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-top {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-middle {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-bottom {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-horizontal {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-align-vertical {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Formats
@@ -382,104 +382,105 @@
&.icon-format-pdf {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-pdfa {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-pptx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ // xml:space="preserve"
+ .encoded-svg-mask('');
}
&.icon-format-potx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-odp {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-otp {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('')
}
// Collaboration
&.icon-users {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-app-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//Comments
&.icon-menu-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-resolve-comment.check {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
&.icon-done-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-done-comment-white {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
&.icon-add-table {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-link {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
}
@@ -495,91 +496,91 @@
&.icon-undo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-redo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-burger {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-play {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-prev {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-next {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-expand-down {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @fill-white);
}
&.icon-add-slide {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-close-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
}
}
diff --git a/apps/presentationeditor/mobile/src/page/app.jsx b/apps/presentationeditor/mobile/src/page/app.jsx
index 55d94d9b2..699cdcc8f 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 */}
diff --git a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
index dfdbd0e32..d00f01ace 100644
--- a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
+++ b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
@@ -144,7 +144,7 @@ const PageLink = props => {
{
props.onInsertLink(typeLink, (typeLink === 1 ?
{url: link, display: stateDisplay, tip: screenTip, displayDisabled: displayDisabled } :
diff --git a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
index 257b17063..9a929743d 100644
--- a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
+++ b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
@@ -1,7 +1,8 @@
-import React, {Fragment} from "react";
+import React, {Fragment, useState} from "react";
import { observer, inject } from "mobx-react";
import { Page, Navbar, List, ListItem, BlockTitle, Toggle } from "framework7-react";
import { useTranslation } from "react-i18next";
+import { Themes } from '../../../../../common/mobile/lib/controller/Themes.js';
const PageApplicationSettings = props => {
const { t } = useTranslation();
@@ -9,6 +10,7 @@ const PageApplicationSettings = props => {
const store = props.storeApplicationSettings;
const unitMeasurement = store.unitMeasurement;
const isSpellChecking = store.isSpellChecking;
+ const [isThemeDark, setIsThemeDark] = useState(Themes.isCurrentDark);
const changeMeasureSettings = value => {
store.changeUnitMeasurement(value);
@@ -44,6 +46,11 @@ const PageApplicationSettings = props => {
}}
/>
+
+ {Themes.switchDarkTheme(!toggle), setIsThemeDark(!toggle)}}>
+
+
}
diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index 5f8eb9447..d752ec41d 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -659,7 +659,8 @@
"txtSemicolon": "Semicolon",
"txtSpace": "Space",
"txtTab": "Tab",
- "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?"
+ "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?",
+ "textDarkTheme": "Dark Theme"
}
}
}
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
index 8d85d8e71..e3f2fa1dd 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
@@ -98,7 +98,7 @@ class ApplicationSettingsController extends Component {
clickR1C1Style={this.clickR1C1Style}
onChangeMacrosSettings={this.onChangeMacrosSettings}
onFormulaLangChange={this.onFormulaLangChange}
- onRegSettings={this.onRegSettings}
+ onRegSettings={this.onRegSettings}
/>
)
}
diff --git a/apps/spreadsheeteditor/mobile/src/less/app-material.less b/apps/spreadsheeteditor/mobile/src/less/app-material.less
index cbb0da4ce..2995a0049 100644
--- a/apps/spreadsheeteditor/mobile/src/less/app-material.less
+++ b/apps/spreadsheeteditor/mobile/src/less/app-material.less
@@ -6,9 +6,9 @@
.device-android {
- --f7-navbar-bg-color: @themeColor;
- --f7-navbar-link-color: @navBarIconColor;
- --f7-navbar-text-color: @navBarIconColor;
+ --f7-navbar-bg-color: @brandColor;
+ --f7-navbar-link-color: @text-link;
+ --f7-navbar-text-color: @text-normal;
--f7-list-button-border-color: @listButtonBorderColor;
// Main Toolbar
@@ -33,7 +33,7 @@
border: 2px solid var(--f7-checkbox-inactive-color);
}
label.item-checkbox input[type='checkbox']:checked ~ .icon-checkbox {
- border-color: @themeColor;
+ border-color: @brandColor;
background-color: transparent;
}
label.item-content i.icon.icon-checkbox:after {
@@ -45,7 +45,7 @@
top: 50%;
margin-left: -5px;
margin-top: -5px;
- background-color: @themeColor;
+ background-color: @brandColor;
border-radius: 100%;
}
}
diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less
index 6be8afc19..b9a01b802 100644
--- a/apps/spreadsheeteditor/mobile/src/less/app.less
+++ b/apps/spreadsheeteditor/mobile/src/less/app.less
@@ -1,12 +1,29 @@
-
-@themeColor: #40865c;
-
@import '../../../../common/mobile/resources/less/variables.less';
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
-
@import '../../../../common/mobile/resources/less/_mixins.less';
@import '../../../../common/mobile/resources/less/colors-table.less';
@import '../../../../common/mobile/resources/less/colors-table-dark.less';
+
+// @themeColor: #40865c;
+@brandColor: var(--brand-cell);
+
+.device-ios {
+ --toolbar-background: var(--background-primary, #fff);
+ --toolbar-segment: var(--brand-cell, #40865C);
+ --toolbar-icons: var(--brand-cell, #40865C);
+}
+.device-android {
+ --toolbar-background: var(--brand-cell, #40865C);
+
+ .theme-type-dark {
+ --toolbar-icons: var(--brand-cell, #40865C);
+ }
+}
+
+@toolbar-background: var(--toolbar-background);
+@toolbar-segment: var(--toolbar-segment);
+@button-active-opacity: var(--active-opacity-cell);
+
@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/spreadsheeteditor/mobile/src/less/celleditor.less b/apps/spreadsheeteditor/mobile/src/less/celleditor.less
index 53be7192a..f59c51d7d 100644
--- a/apps/spreadsheeteditor/mobile/src/less/celleditor.less
+++ b/apps/spreadsheeteditor/mobile/src/less/celleditor.less
@@ -28,7 +28,8 @@
&:after {
content: '';
position: absolute;
- background-color: @border-regular-control;
+ // background-color: @border-regular-control;
+ background-color: @background-menu-divider;
display: block;
z-index: 15;
top: auto;
@@ -43,11 +44,12 @@
#box-cell-name {
display: inline-flex;
- background-color: var(--f7-navbar-bg-color);
+ // background-color: var(--f7-navbar-bg-color);
+ // background-color: @fill-white;
- .md & {
- background-color: @gray-light;
- }
+ // .md & {
+ // background-color: @gray-light;
+ // }
}
#idx-cell-name {
@@ -80,9 +82,10 @@
#idx-cell-content {
padding: 3px 3px;
line-height: 1.428571429;
- color: #000;
+ // color: #000;
+ color: @text-normal;
vertical-align: middle;
- background-color: @contentBackColor;
+ // background-color: @contentBackColor;
min-height: @cellEditorHeight;
height: 100%;
width: 100%;
@@ -97,7 +100,8 @@
width: 8px;
height: 8px;
background-color: transparent;
- border: solid 1px black;
+ // border: solid 1px black;
+ border: solid 1px @brandColor;
border-bottom: none;
border-right: none;
@@ -117,8 +121,12 @@
}
}
+ .ce-group {
+ background-color: @background-secondary;
+ }
+
.group--content {
position: relative;
- .hairline(left, @statusBarBorderColor);
+ .hairline(left, @background-menu-divider);
}
}
diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less
index 875a0c8e6..142989494 100644
--- a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less
+++ b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less
@@ -5,172 +5,172 @@
&.icon-search {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-undo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-redo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-reader {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-download {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-print {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-info {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-about {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-help {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-versions {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-color {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-fill-color {
width: 22px;
height: 22px;
background-size: 130%;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-align-center {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-jast {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-left {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-right {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-top {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-middle {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-bottom {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-expand-down {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-link {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-insimage {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-sort {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-image-library {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-cell-wrap {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-function {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-normal);
}
// Reorder
&.icon-move-backward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-forward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-background {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-foreground {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Presets of table borders
@@ -178,62 +178,62 @@
&.icon-table-borders-all {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-none {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-inner {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-outer {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-left {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-center {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-right {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-top {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-middle {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-bottom {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-dup {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-ddown {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Cell formats
@@ -241,52 +241,52 @@
&.icon-format-general {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-number {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-integer {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-scientific {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-accounting {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-currency {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-date {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-time {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-percentage {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-text {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Filter sort
@@ -294,12 +294,12 @@
&.sortdown {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.sortup {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Formats
@@ -307,131 +307,131 @@
&.icon-format-pdf {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-pdfa {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-xlsx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-xltx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-ods {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-ots {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-csv {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Collaboration
&.icon-users {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-app-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//Comments
&.icon-menu-comment {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment.check {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @brandColor);
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//Insert
&.icon-add-chart {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-formula {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Text orientation
&.icon-text-orientation-horizontal {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-anglecount {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-angleclock {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-vertical {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-rotateup {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-rotatedown {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
@@ -440,27 +440,27 @@
&.icon-add-chart {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-formula {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-link {
background: #fff;
diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-material.less b/apps/spreadsheeteditor/mobile/src/less/icons-material.less
index 082c7f232..70a6e5c9d 100644
--- a/apps/spreadsheeteditor/mobile/src/less/icons-material.less
+++ b/apps/spreadsheeteditor/mobile/src/less/icons-material.less
@@ -5,132 +5,132 @@
&.icon-expand-up {
width: 17px;
height: 17px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-expand-down {
width: 17px;
height: 17px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-edit {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-edit-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-reader {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-download {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-print {
width: 22px;
- height: 28px;
- .encoded-svg-background('');
+ height: 22px;
+ .encoded-svg-mask('');
}
&.icon-info {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-about {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-help {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-versions {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-color {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-align-center {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-jast {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-left {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-align-right {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-top {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-middle {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-text-valign-bottom {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-link {
width: 24px;
height: 24px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.icon-insimage, &.icon-image-library {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-sort {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-function {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-normal);
}
&.icon-app-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-settings {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
@@ -139,22 +139,22 @@
&.icon-move-backward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-forward {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-background {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-move-foreground {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Presets of table borders
@@ -162,62 +162,62 @@
&.icon-table-borders-all {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-none {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-inner {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-outer {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-left {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-center {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-right {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-top {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-middle {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-bottom {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-dup {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-table-borders-ddown {
width: 28px;
height: 28px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Cell formats
@@ -225,52 +225,52 @@
&.icon-format-general {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-number {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-integer {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-scientific {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-accounting {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-currency {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-date {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-time {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-percentage {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-text {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Filter sort
@@ -278,12 +278,12 @@
&.sortdown {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
&.sortup {
width: 22px;
height: 22px;
- .encoded-svg-mask('');
+ .encoded-svg-mask('');
}
// Formats
@@ -291,110 +291,110 @@
&.icon-format-pdf {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-pdfa {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-xlsx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-xltx {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-ods {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-ots {
width: 30px;
height: 30px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-format-csv {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
// Collaboration
&.icon-users {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
//Comments
&.icon-menu-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @text-tertiary);
}
&.icon-resolve-comment.check {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-done-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-insert-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-done-comment-white {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-background('');
}
// Text orientation
&.icon-text-orientation-horizontal {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-anglecount {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-angleclock {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-vertical {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-rotateup {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-text-orientation-rotatedown {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
@@ -419,77 +419,77 @@
&.icon-undo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-redo {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-search {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-burger {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-plus {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-settings {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-prev {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-next {
width: 20px;
height: 20px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-expand-down {
width: 22px;
height: 22px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-chart {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-formula {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-shape {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-image {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-add-other {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
&.icon-close-comment {
width: 24px;
height: 24px;
- .encoded-svg-background('');
+ .encoded-svg-mask('', @toolbar-icons);
}
}
}
diff --git a/apps/spreadsheeteditor/mobile/src/less/statusbar.less b/apps/spreadsheeteditor/mobile/src/less/statusbar.less
index 40fe15ce9..2daf9242a 100644
--- a/apps/spreadsheeteditor/mobile/src/less/statusbar.less
+++ b/apps/spreadsheeteditor/mobile/src/less/statusbar.less
@@ -2,10 +2,10 @@
@fontColor: #000;
.statusbar {
- .hairline(top, @border-regular-control);
+ .hairline(top, @background-menu-divider);
height: @statusbar-height;
min-height: @statusbar-height;
- background-color: @background-normal;
+ background-color: @background-tertiary;
display: flex;
.tab {
@@ -21,7 +21,7 @@
height: 100%;
position: relative;
- .hairline(right, @border-regular-control);
+ .hairline(right, @background-menu-divider);
}
.statusbar--box-tabs {
@@ -65,9 +65,10 @@
width: 22px;
height: 22px;
&.icon-plus {
- @source: '';
- .encoded-svg-mask(@source, @fontColor);
- background-image: none;
+ // @source: '';
+ // .encoded-svg-mask(@source, @fontColor);
+ // background-image: none;
+ .encoded-svg-mask('')
}
}
}
diff --git a/apps/spreadsheeteditor/mobile/src/page/app.jsx b/apps/spreadsheeteditor/mobile/src/page/app.jsx
index 2bf443815..44da854e1 100644
--- a/apps/spreadsheeteditor/mobile/src/page/app.jsx
+++ b/apps/spreadsheeteditor/mobile/src/page/app.jsx
@@ -35,7 +35,7 @@ export default class extends React.Component {
render() {
return (
-
+
{/* Your main view, should have "view-main" class */}
diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
index 207607719..52e08bb5d 100644
--- a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
@@ -1,7 +1,8 @@
-import React, {Fragment} from "react";
+import React, {Fragment, useState} from "react";
import { observer, inject } from "mobx-react";
import { Page, Navbar, List, ListItem, BlockTitle, Toggle, Icon } from "framework7-react";
import { useTranslation } from "react-i18next";
+import { Themes } from '../../../../../common/mobile/lib/controller/Themes.js';
const PageApplicationSettings = props => {
const { t } = useTranslation();
@@ -20,6 +21,7 @@ const PageApplicationSettings = props => {
const isRefStyle = storeApplicationSettings.isRefStyle;
const isComments = storeApplicationSettings.isComments;
const isResolvedComments = storeApplicationSettings.isResolvedComments;
+ const [isThemeDark, setIsThemeDark] = useState(Themes.isCurrentDark);
const changeMeasureSettings = value => {
storeApplicationSettings.changeUnitMeasurement(value);
@@ -92,6 +94,11 @@ const PageApplicationSettings = props => {
}}
/>
+
+ {Themes.switchDarkTheme(!toggle), setIsThemeDark(!toggle)}}>
+
+
{/* } */}
{/* {_isShowMacros && */}