diff --git a/apps/common/mobile/resources/less/_mixins.less b/apps/common/mobile/resources/less/_mixins.less index dda2a2d7f5..c09e943e56 100644 --- a/apps/common/mobile/resources/less/_mixins.less +++ b/apps/common/mobile/resources/less/_mixins.less @@ -3,6 +3,7 @@ @url: `encodeURIComponent(@{svg})`; background-color: @color; -webkit-mask-image: url("data:image/svg+xml;charset=utf-8,@{url}"); + -webkit-mask-size: contain; } .encoded-svg-uncolored-mask(@svg) { diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 182a5593fa..1a90d098c5 100644 --- a/apps/common/mobile/resources/less/about.less +++ b/apps/common/mobile/resources/less/about.less @@ -41,4 +41,10 @@ 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"; + } + } } diff --git a/apps/common/mobile/resources/less/colors-table-dark.less b/apps/common/mobile/resources/less/colors-table-dark.less index f2c790effa..c2604bf94a 100644 --- a/apps/common/mobile/resources/less/colors-table-dark.less +++ b/apps/common/mobile/resources/less/colors-table-dark.less @@ -29,5 +29,8 @@ --toolbar-tab-normal: #757575; --component-disabled-opacity: .4; + --button-active-opacity: fade(#446995, 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 5addf77594..48975db769 100644 --- a/apps/common/mobile/resources/less/colors-table.less +++ b/apps/common/mobile/resources/less/colors-table.less @@ -27,6 +27,9 @@ --toolbar-tab-normal:fade(#FFF, 50%); --component-disabled-opacity: .4; + --button-active-opacity: fade(#446995, 30%); + + --image-border-types-filter: none; } @brand-word: var(--brand-word); diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index 3b97616468..f2c9d5c8af 100644 --- a/apps/common/mobile/resources/less/comments.less +++ b/apps/common/mobile/resources/less/comments.less @@ -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%; } } diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 2fc5617639..64693746e3 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -289,6 +289,9 @@ display: flex; align-items: center; justify-content: center; + &.active { + background-color: var(--button-active-opacity); + } } } } diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 01249b763c..563cc1b1ea 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -19,7 +19,7 @@ --f7-navbar-height: 56px; --f7-subnavbar-bg-color: @toolbar-background; - --f7-subnavbar-link-color: @fill-white; + --f7-subnavbar-link-color: @toolbar-icons; --f7-subnavbar-text-color: @fill-white; --f7-subnavbar-height: 56px; @@ -151,7 +151,7 @@ } .button-fill { - color: @white; + color: @brand-text-on-brand; // background-color: @brandColor; background-color: transparent; } @@ -161,7 +161,7 @@ } .button-red { - color: @white; + color: @brand-text-on-brand; background-color:@text-error; } @@ -303,7 +303,7 @@ } &.active { // color: @white; - background-color: var(--button-active); + background-color: var(--button-active-opacity); // i.icon { // background-color: @white; // } @@ -320,6 +320,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; } diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 6a8fa7e026..60f83114e0 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -92,6 +92,10 @@ max-height: initial; -webkit-line-clamp: initial; } + + .font-item img { + filter: var(--image-border-types-filter, none); + } } .shapes { diff --git a/apps/common/mobile/resources/less/ios/comments.less b/apps/common/mobile/resources/less/ios/comments.less index a00df23c6a..2626b9a1ee 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: @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/material/comments.less b/apps/common/mobile/resources/less/material/comments.less index 92616d7c28..ba039da9bf 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: @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/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index c241413106..1864b665d2 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -12,11 +12,9 @@ .device-android { --toolbar-background: var(--brand-word, #446995); - --button-active: fade(#446995, 30%); .theme-type-dark { --toolbar-icons: var(--brand-word, #446995); - --button-active: fade(#446995, 20%); } } diff --git a/apps/documenteditor/mobile/src/less/icons-ios.less b/apps/documenteditor/mobile/src/less/icons-ios.less index 1365f70870..aeb365da29 100644 --- a/apps/documenteditor/mobile/src/less/icons-ios.less +++ b/apps/documenteditor/mobile/src/less/icons-ios.less @@ -495,7 +495,7 @@ &.icon-resolve-comment.check { width: 30px; height: 30px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-insert-comment { width: 24px; diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less index 9f07f57f82..6178a55bb4 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -78,7 +78,7 @@ &.icon-expand-down { width: 17px; height: 17px; - .encoded-svg-mask(''); + .encoded-svg-mask('', @fill-white); } &.icon-expand-up { width: 17px; @@ -443,17 +443,17 @@ &.icon-menu-comment { width: 24px; height: 24px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); } &.icon-resolve-comment { width: 24px; height: 24px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); } &.icon-resolve-comment.check { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-done-comment { width: 24px; @@ -468,7 +468,7 @@ &.icon-done-comment-white { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-mask('', @fill-white); } } } \ No newline at end of file