diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 3072fb575..182a5593f 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; @@ -31,6 +32,7 @@ p > label { margin-right: 5px; + color: @text-secondary; } .logo { diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index 9ba3d478b..3b9761646 100644 --- a/apps/common/mobile/resources/less/comments.less +++ b/apps/common/mobile/resources/less/comments.less @@ -93,7 +93,7 @@ font-size: 14px; } .comment-text, .reply-text { - color: @black; + color: @text-normal; font-size: 14px; line-height: 25px; margin: 0; diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index d46ad8555..2fc561763 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -130,9 +130,12 @@ --f7-list-item-title-text-color: @text-normal; --f7-label-text-color: @text-normal; --f7-list-item-after-text-color: @text-normal; - --f7-input-text-color: @text-normal; + + --f7-input-text-color: @text-secondary; --f7-block-title-text-color: @text-secondary; --f7-input-placeholder-color: @text-secondary; + --f7-list-item-text-text-color: @text-secondary; + --f7-list-item-subtitle-text-color: @text-secondary; --f7-list-chevron-icon-color: @text-tertiary; @@ -189,7 +192,7 @@ .thumb { width: 100%; height: 100%; - background-color: @white; + background-color: @fill-white; background-size: cover; label { @@ -329,7 +332,9 @@ border-radius: 0 5px 5px 0; } &.tab-link-active { - background-color: @toolbar-segment; + // background: @brandColor; + // color: @fill-white; + background: @toolbar-segment; color: @brand-text-on-brand; i.icon { background-color: @brand-text-on-brand; @@ -361,21 +366,21 @@ outline: 0; &.active { background: @brandColor; - color: @white; + color: @fill-white; i.icon { - background-color: @white; + background-color: @fill-white; } } } .button-fill { color: @brandColor; - background-color: @white; + background-color: @fill-white; } .button-red { - color: @red; - background-color: @text-error; + color: @text-error; + background-color: @fill-white; } .buttons-list { @@ -392,7 +397,7 @@ } .button-red .list-button { - color: red; + color: @text-error; } .list-button { @@ -414,7 +419,7 @@ .shapes { .page-content { - background: @white; + background: @fill-white; } } @@ -445,7 +450,7 @@ .dataview, #add-table, #add-shape, #add-slide, #add-chart { &.page-content, .page-content { - background-color: @white; + background-color: @background-tertiary; } } @@ -500,11 +505,11 @@ appearance: none; border-radius: 5px; font-family: inherit; - color: @black; + color: @fill-black; font-size: 14px; font-weight: 400; padding: 0 8px; - background-color: @white; + background-color: @fill-white; padding: 0 28px; } @@ -571,13 +576,14 @@ .actions-button { background: @background-secondary; + --f7-actions-button-border-color: @background-menu-divider; } .actions-button-text { height: 57px; line-height: 57px; font-size: 20px; - color: @brandColor; + // color: @brandColor; white-space: normal; text-overflow: ellipsis; } diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index cc821fdc8..01249b763 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -88,9 +88,12 @@ --f7-list-item-title-text-color: @text-normal; --f7-label-text-color: @text-normal; - --f7-input-text-color: @text-normal; + + --f7-input-text-color: @text-secondary; --f7-block-title-text-color: @text-secondary; --f7-input-placeholder-color: @text-secondary; + --f7-list-item-text-text-color: @text-secondary; + --f7-list-item-subtitle-text-color: @text-secondary; --f7-list-item-border-color: @background-menu-divider; --f7-list-chevron-icon-color: @text-tertiary; diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index de00cb878..6a8fa7e02 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -149,7 +149,7 @@ .content-block { margin: 0 auto 15px; a { - color: @black; + // color: @black; } } } @@ -166,7 +166,7 @@ .color-schemes-menu { cursor: pointer; display: block; - background-color: @white; + // background-color: @white; .item-inner { justify-content: flex-start; } @@ -181,7 +181,7 @@ } .item-title { margin-left: 20px; - color: #212121; + // color: #212121; } } @@ -481,7 +481,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; diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less index a595cf5c7..059683ae1 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; diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less index 80d3ec808..d8f784511 100644 --- a/apps/documenteditor/mobile/src/less/app-ios.less +++ b/apps/documenteditor/mobile/src/less/app-ios.less @@ -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 cdfa9149c..0182800f7 100644 --- a/apps/documenteditor/mobile/src/less/app-material.less +++ b/apps/documenteditor/mobile/src/less/app-material.less @@ -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 e21ca3f70..c24141310 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -67,7 +67,7 @@ .page-review { --f7-toolbar-link-color: @brandColor; .toolbar { - background-color: @white; + // background-color: @white; box-shadow: 0 1px 10px rgba(0, 0, 0, 0.2); position: absolute; #btn-reject-change { @@ -83,9 +83,10 @@ } } .page-content { - background-color: @white; + // background-color: @white; .no-changes { padding: 15px; + color: @text-normal; } .block-description { padding: 15px; diff --git a/apps/documenteditor/mobile/src/less/icons-ios.less b/apps/documenteditor/mobile/src/less/icons-ios.less index 251680355..1365f7087 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-mask(''); + .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 015d1e8ba..9f07f57f8 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -453,7 +453,7 @@ &.icon-resolve-comment.check { width: 24px; height: 24px; - .encoded-svg-mask(''); + .encoded-svg-background(''); } &.icon-done-comment { width: 24px;