diff --git a/apps/common/mobile/resources/less/colors-table-dark.less b/apps/common/mobile/resources/less/colors-table-dark.less index 485e7d3870..4b7ce6d5a7 100644 --- a/apps/common/mobile/resources/less/colors-table-dark.less +++ b/apps/common/mobile/resources/less/colors-table-dark.less @@ -12,14 +12,13 @@ --text-tertiary: fade(#FFF, 40%); --text-link: #1976D2; --text-error: #FF453A; - --text-on-brand: #000; --fill-black: #000; --fill-white: #FFF; --brand-word: #208BFF; --brand-cell: #34C759; - --brand-slide: #FF4A31; + --brand-slide: #FE8C33; --brand-primary: #3E9CF0; --brand-secondary: #FFAF49; --brand-text-on-brand: #000; diff --git a/apps/common/mobile/resources/less/colors-table.less b/apps/common/mobile/resources/less/colors-table.less index cf7d4a7b44..d6f5536f5f 100644 --- a/apps/common/mobile/resources/less/colors-table.less +++ b/apps/common/mobile/resources/less/colors-table.less @@ -17,7 +17,6 @@ --text-tertiary: fade(#000, 40%); --text-link: #007AFF; --text-error: #FF3B30; - --text-on-brand: #fff; --fill-black: #000; --fill-white: #FFF; diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index b87f9e5053..905b031216 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: @fill-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 b47d6a986a..2e5b4784a0 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -68,6 +68,12 @@ } } + .subnavbar { + .icon-back { + color: @brandColor; + } + } + .popover__titled { .list { ul { @@ -324,6 +330,7 @@ cursor: pointer; outline: 0; font-weight: 600; + color: @brandColor; &:first-child { border-radius: 5px 0 0 5px; border-left-width: 1px; @@ -334,7 +341,7 @@ } &.tab-link-active { background: @brandColor; - color: @fill-white; + color: @brand-text-on-brand; } } } diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 707fba6ee5..9c58b27f65 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -6,7 +6,7 @@ @darkGreen: #40865c; @darkGrey: #757575; @text-normal: var(--text-normal); - @text-on-brand: var(--text-on-brand); + @brand-text-on-brand: var(--brand-text-on-brand); @touchColor: rgba(255,255,255,0.1); @@ -145,7 +145,7 @@ } .button-fill { - color: @text-on-brand; + color: @brand-text-on-brand; // background-color: @brandColor; background-color: transparent; } @@ -155,7 +155,7 @@ } .button-red { - color: @text-on-brand; + color: @brand-text-on-brand; background-color: @text-error; } @@ -184,7 +184,7 @@ } .button-fill .list-button { background-color: @brandColor; - color: @text-on-brand; + color: @brand-text-on-brand; height: 36px; text-align: center; line-height: 36px; diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 7d88042aa1..370da5d179 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 { @@ -169,7 +172,6 @@ .color-schemes-menu { cursor: pointer; display: block; - background-color: @background-tertiary; .item-inner { justify-content: flex-start; } diff --git a/apps/common/mobile/resources/less/ios/comments.less b/apps/common/mobile/resources/less/ios/comments.less index a00df23c6a..9bcca5565d 100644 --- a/apps/common/mobile/resources/less/ios/comments.less +++ b/apps/common/mobile/resources/less/ios/comments.less @@ -1,6 +1,7 @@ .device-ios { .wrap-comment { height: calc(100% - 60px); + background-color: @background-tertiary; } .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 4b877c1912..aff51e2f59 100644 --- a/apps/common/mobile/resources/less/material/comments.less +++ b/apps/common/mobile/resources/less/material/comments.less @@ -1,6 +1,7 @@ .device-android { .wrap-comment { height: calc(100% - 72px); + background-color: @background-tertiary; } .add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog { .wrap-textarea { diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less index 7af159c825..1c4d22df8d 100644 --- a/apps/presentationeditor/mobile/src/less/app.less +++ b/apps/presentationeditor/mobile/src/less/app.less @@ -9,6 +9,7 @@ .device-ios { --toolbar-background: var(--background-primary, #fff); + // --toolbar-background: var(--background-tertiary, #f7f7f8); --toolbar-icons: var(--brand-slide, #aa5252); } .device-android { diff --git a/apps/presentationeditor/mobile/src/less/icons-ios.less b/apps/presentationeditor/mobile/src/less/icons-ios.less index 0416251651..af77a3c27b 100644 --- a/apps/presentationeditor/mobile/src/less/icons-ios.less +++ b/apps/presentationeditor/mobile/src/less/icons-ios.less @@ -442,7 +442,7 @@ &.icon-format-otp { width: 30px; height: 30px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); } // Collaboration diff --git a/apps/presentationeditor/mobile/src/less/icons-material.less b/apps/presentationeditor/mobile/src/less/icons-material.less index 04db4d271a..7c31594baf 100644 --- a/apps/presentationeditor/mobile/src/less/icons-material.less +++ b/apps/presentationeditor/mobile/src/less/icons-material.less @@ -4,7 +4,7 @@ &.icon-expand-up { width: 17px; height: 17px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); } &.icon-expand-down { @@ -433,19 +433,19 @@ &.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-mask(''); + .encoded-svg-background(''); } &.icon-done-comment { @@ -463,7 +463,7 @@ &.icon-done-comment-white { width: 24px; height: 24px; - .encoded-svg-mask(''); + .encoded-svg-mask('', @fill-white); } &.icon-add-table { @@ -547,14 +547,10 @@ .encoded-svg-mask('', @toolbar-icons); } - &.icon-back { - color: @toolbar-icons; - } - &.icon-expand-down { width: 22px; height: 22px; - .encoded-svg-mask('', @toolbar-icons); + .encoded-svg-mask('', @fill-white); } &.icon-add-slide {