From e1101cb3b0b0bddecb047b6f0304229f3fcb4edc Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Fri, 12 Apr 2024 17:32:01 +0300 Subject: [PATCH] [SSE] changed colors table --- apps/common/main/lib/controller/Themes.js | 6 +++--- .../main/resources/less/colors-table-classic.less | 7 ++++--- .../resources/less/colors-table-dark-contrast.less | 7 ++++--- .../main/resources/less/colors-table-dark.less | 7 ++++--- apps/common/main/resources/less/colors-table.less | 7 ++++--- apps/common/mobile/lib/store/themes.js | 13 +++---------- .../mobile/resources/less/colors-table-dark.less | 5 +++-- apps/common/mobile/resources/less/colors-table.less | 6 +++--- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index f279f48a58..ebcdf57d44 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -161,12 +161,12 @@ define([ "canvas-high-contrast-disabled", "canvas-cell-border", - "canvas-cell-title", + "canvas-cell-title-background", + "canvas-cell-title-background-hover", + "canvas-cell-title-background-selected", "canvas-cell-title-border", "canvas-cell-title-border-hover", "canvas-cell-title-border-selected", - "canvas-cell-title-hover", - "canvas-cell-title-selected", "canvas-dark-cell-title", "canvas-dark-cell-title-hover", diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index b73e1cc72c..490a9bd1f6 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -87,9 +87,10 @@ --canvas-high-contrast-disabled: #82878f; --canvas-cell-border: fade(#000, 10%); - --canvas-cell-title: #444; - --canvas-cell-title-hover: #d6d6d6; - --canvas-cell-title-selected: #c1c1c1; + --canvas-cell-title-text: #444; + --canvas-cell-title-background: #f7f7f7; + --canvas-cell-title-background-hover: #d6d6d6; + --canvas-cell-title-background-selected: #c1c1c1; --canvas-cell-title-border: #cdcdcd; --canvas-cell-title-border-hover: #afafaf; --canvas-cell-title-border-selected: #929292; diff --git a/apps/common/main/resources/less/colors-table-dark-contrast.less b/apps/common/main/resources/less/colors-table-dark-contrast.less index 6802dae2a9..825a41b0d9 100644 --- a/apps/common/main/resources/less/colors-table-dark-contrast.less +++ b/apps/common/main/resources/less/colors-table-dark-contrast.less @@ -89,12 +89,13 @@ --canvas-high-contrast-disabled: #7d7d7d; --canvas-cell-border: #656565; - --canvas-cell-title: #e8e8e8; + --canvas-cell-title-text: #e8e8e8; + --canvas-cell-title-background: #1d1d1d; + --canvas-cell-title-background-hover: #303030; + --canvas-cell-title-background-selected: #3d3d3d; --canvas-cell-title-border: #616161; --canvas-cell-title-border-hover: #a0a0a0; --canvas-cell-title-border-selected: #888888; - --canvas-cell-title-hover: #303030; - --canvas-cell-title-selected: #3d3d3d; --canvas-dark-cell-title: #55B27B; --canvas-dark-cell-title-hover: #7AFFAF; diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index dd6907c87c..3d79690f7a 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -89,12 +89,13 @@ --canvas-high-contrast-disabled: #ccc; --canvas-cell-border: fade(#000, 10%); - --canvas-cell-title: #d9d9d9; + --canvas-cell-title-text: #d9d9d9; + --canvas-cell-title-background: #555; + --canvas-cell-title-background-hover: #787878; + --canvas-cell-title-background-selected: #939393; --canvas-cell-title-border: #757575; --canvas-cell-title-border-hover: #858585; --canvas-cell-title-border-selected: #9e9e9e; - --canvas-cell-title-hover: #787878; - --canvas-cell-title-selected: #939393; --canvas-dark-cell-title: #55B27B; --canvas-dark-cell-title-hover: #7AFFAF; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 3569bf4826..4871aeccec 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -100,9 +100,10 @@ --canvas-high-contrast-disabled: #666; --canvas-cell-border: fade(#000, 10%); - --canvas-cell-title: #444; - --canvas-cell-title-hover: #dfdfdf; - --canvas-cell-title-selected: #cfcfcf; + --canvas-cell-title-text: #444; + --canvas-cell-title-background: #f7f7f7; + --canvas-cell-title-background-hover: #dfdfdf; + --canvas-cell-title-background-selected: #cfcfcf; --canvas-cell-title-border: #d8d8d8; --canvas-cell-title-border-hover: #c9c9c9; --canvas-cell-title-border-selected: #bbb; diff --git a/apps/common/mobile/lib/store/themes.js b/apps/common/mobile/lib/store/themes.js index 6315a71e3e..0c54be870e 100644 --- a/apps/common/mobile/lib/store/themes.js +++ b/apps/common/mobile/lib/store/themes.js @@ -49,16 +49,9 @@ export class storeThemes { "canvas-cell-title-border-hover", "canvas-cell-title-border-selected", "canvas-cell-title-hover", - "canvas-cell-title-selected", - - "canvas-dark-cell-title", - "canvas-dark-cell-title-hover", - "canvas-dark-cell-title-selected", - "canvas-dark-cell-title-border", - "canvas-dark-cell-title-border-hover", - "canvas-dark-cell-title-border-selected", - "canvas-dark-content-background", - "canvas-dark-page-border", + "canvas-cell-title-text", + "canvas-cell-title-background", + "canvas-cell-title-background-selected", "canvas-scroll-thumb", "canvas-scroll-thumb-hover", diff --git a/apps/common/mobile/resources/less/colors-table-dark.less b/apps/common/mobile/resources/less/colors-table-dark.less index 88563d7e1e..76965c9916 100644 --- a/apps/common/mobile/resources/less/colors-table-dark.less +++ b/apps/common/mobile/resources/less/colors-table-dark.less @@ -60,8 +60,9 @@ --canvas-cell-title-border: #d5d5d5; --canvas-cell-title-border-hover: #858585; --canvas-cell-title-border-selected: #afafaf; - //--canvas-cell-title-hover: #787878; - --canvas-cell-title-selected: #939393; + --canvas-cell-title-text: #d9d9d9; + --canvas-cell-title-background: #000; + --canvas-cell-title-background-selected: #939393; //--canvas-scroll-thumb: #404040; //--canvas-scroll-thumb-hover: #999; diff --git a/apps/common/mobile/resources/less/colors-table.less b/apps/common/mobile/resources/less/colors-table.less index c56f069e7d..2b2af8c525 100644 --- a/apps/common/mobile/resources/less/colors-table.less +++ b/apps/common/mobile/resources/less/colors-table.less @@ -53,10 +53,10 @@ //--canvas-high-contrast-disabled: #666; --canvas-cell-border: fade(#000, 10%); - //--canvas-cell-title-hover: #dfdfdf; - --canvas-cell-title-selected: #cfcfcf; + --canvas-cell-title-text: #444; + --canvas-cell-title-background: #f7f7f7; + --canvas-cell-title-background-selected: #cfcfcf; --canvas-cell-title-border: #d8d8d8; - //--canvas-cell-title-border-hover: #c9c9c9; --canvas-cell-title-border-selected: #bbb; //--canvas-scroll-thumb: #f7f7f7;