From 551ffb48c6ce5b14926a0abb727f7f3b5f292cb5 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 20 Jan 2021 22:32:46 +0300 Subject: [PATCH] [stylesheets] changed styleshteets according to colors table --- apps/common/main/resources/less/chat.less | 2 +- apps/common/main/resources/less/colors-table-dark.less | 1 + apps/common/main/resources/less/colors-table.less | 5 ++--- apps/common/main/resources/less/comments.less | 6 +++--- apps/spreadsheeteditor/main/resources/less/statusbar.less | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less index 32b030d9d..e9556645f 100644 --- a/apps/common/main/resources/less/chat.less +++ b/apps/common/main/resources/less/chat.less @@ -143,7 +143,7 @@ height: 100%; resize: none; margin-bottom: 5px; - border: 1px solid @border-toolbar; + border: 1px solid @border-regular-control; font-size: 12px; &:focus { diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index d7334cf15..4323ae462 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -47,6 +47,7 @@ --icon-toolbar-header: fade(#fff, 80%); --icon-notification-badge: #000; --icon-contrast-popover: #fff; + --icon-success: #090; --canvas-background: #666666; --canvas-content-background: #fff; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index e4e0f3989..0713af6d9 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -56,6 +56,7 @@ --icon-toolbar-header: #fff; --icon-notification-badge: #000; --icon-contrast-popover: #fff; + --icon-success: #090; --canvas-background: #e2e2e2; --canvas-content-background: #fff; @@ -87,8 +88,6 @@ --image-border-types-filter: none; --image-border-types-filter-selected: none; --component-normal-icon-filter: none; - - --comment-resolved-icon-color: green; } // Background @@ -143,6 +142,7 @@ @icon-toolbar-header: var(--icon-toolbar-header); @icon-contrast-popover: var(--icon-contrast-popover); @icon-notification-badge: var(--icon-notification-badge); +@icon-success: var(--icon-success); @button-small-normal-icon-offset-x: var(--button-small-normal-icon-offset-x,0); @button-small-active-icon-offset-x: var(--button-small-active-icon-offset-x,0); @@ -155,6 +155,5 @@ @button-header-active-icon-offset-x: var(--button-header-active-icon-offset-x, -20px); @component-normal-icon-filer: var(--component-normal-icon-filter); -@comment-resolved-icon-color: var(--comment-resolved-icon-color); @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); \ No newline at end of file diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index b34ec46c5..f61a957d5 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -58,7 +58,7 @@ width: 100%; resize: none; margin-bottom: 5px; - border: 1px solid @border-toolbar; + border: 1px solid @border-regular-control; height: 100%; &:focus { border-color: @border-preview-select; @@ -90,7 +90,7 @@ height: 50px; resize: none; margin-bottom: 5px; - border: 1px solid @border-toolbar; + border: 1px solid @border-regular-control; word-break: break-all; line-height: 15px; color: @text-normal; @@ -281,7 +281,7 @@ &.comment-resolved { &:after { - border-color: @comment-resolved-icon-color; + border-color: @icon-success; } } } diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 691235e3b..daced70ce 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -178,7 +178,7 @@ padding: 0 10px 0; line-height: 24px; margin-right: -1px; - background-color: @background-toolbar; + background-color: @background-toolbar-additional; outline: none; border-left: 1px solid @border-toolbar; border-right: 1px solid @border-toolbar; @@ -207,9 +207,9 @@ &.selected { > span { border-bottom-color: @highlight-header-button-hover; - background-color: @highlight-header-button-hover; + background-color: @background-normal; box-shadow: 0px 4px 0 #49795d inset; - color: @text-normal-pressed; + color: @text-normal; } } @@ -260,7 +260,7 @@ &:not(.active) { > span { - color: @border-preview-select; + color: @text-secondary; } }