From 25f56d381a4a461eac866d0267a950519ba04326 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 18 Nov 2020 20:08:12 +0300 Subject: [PATCH] [dark theme] changed @primary and @primary-hover --- apps/common/main/resources/less/buttons.less | 32 ++++++++----------- .../main/resources/less/colorpalette.less | 2 +- apps/common/main/resources/less/combobox.less | 4 +-- apps/common/main/resources/less/dataview.less | 4 +-- .../main/resources/less/dropdown-menu.less | 2 +- apps/common/main/resources/less/history.less | 4 +-- .../main/resources/less/language-dialog.less | 2 +- apps/common/main/resources/less/listview.less | 4 +-- apps/common/main/resources/less/plugins.less | 2 +- apps/common/main/resources/less/switcher.less | 4 +-- apps/common/main/resources/less/toolbar.less | 2 +- .../common/main/resources/less/variables.less | 6 ++-- .../main/resources/less/filemenu.less | 4 +-- .../main/resources/less/toolbar.less | 6 ++-- .../main/resources/less/leftmenu.less | 4 +-- .../main/resources/less/toolbar.less | 4 +-- .../main/resources/less/leftmenu.less | 6 ++-- .../main/resources/less/toolbar.less | 2 +- 18 files changed, 45 insertions(+), 49 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index ced8442c5..515a13364 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -304,7 +304,7 @@ &:active:not(.disabled), &.active:not(.disabled) { color: @text-normal; - background-color: @primary; + background-color: @highlight-button-pressed; } &:not(.icon-top) @@ -382,7 +382,7 @@ &:active:not(.disabled), &.active:not(.disabled) { - background-color: @primary; + background-color: @highlight-button-pressed; color: #fff; } @@ -490,10 +490,6 @@ } } -@color-dark: @primary; -//@color-gray: #079e2f; -//@color-dark: #c52c0e; - &.split { &.over:not(.disabled), @@ -515,7 +511,7 @@ &:active, &:active:hover { - background-color: @color-dark; + background-color: @highlight-button-pressed; } } } @@ -523,7 +519,7 @@ &.open { > button:not(.active) { &:last-of-type { - background-color: @color-dark; + background-color: @highlight-button-pressed; } } @@ -533,7 +529,7 @@ } button.active:not(.disabled) { - background-color: @color-dark; + background-color: @highlight-button-pressed; } .btn + .btn { @@ -626,7 +622,7 @@ &:active, &.active { - background-color: @primary; + background-color: @highlight-button-pressed; } } @@ -650,8 +646,8 @@ &:active:not(.disabled), &.active:not(.disabled) { - background-color: @primary !important; - border-color: @primary; + background-color: @highlight-button-pressed !important; + border-color: @highlight-button-pressed; color: white; } @@ -685,7 +681,7 @@ &:active:not(.disabled), &.active:not(.disabled) { - background-color: @primary !important; + background-color: @highlight-button-pressed !important; color: white; } @@ -717,8 +713,8 @@ &:active:not(.disabled), &.active:not(.disabled) { - background-color: @primary !important; - border-color: @primary; + background-color: @highlight-button-pressed !important; + border-color: @highlight-button-pressed; color: white; } @@ -755,7 +751,7 @@ &:active:not(.disabled), &.active:not(.disabled) { - background-color: @primary !important; + background-color: @highlight-button-pressed !important; } &[disabled], @@ -844,11 +840,11 @@ &.primary { color: #fff; - background-color: @primary; + background-color: @background-primary-dialog-button; &:hover:not(.disabled), &.hover:not(.disabled) { - background-color: @primary-hover; + background-color: @highlight-primary-dialog-button-hover; } } diff --git a/apps/common/main/resources/less/colorpalette.less b/apps/common/main/resources/less/colorpalette.less index 4f16620b7..e72e1435b 100644 --- a/apps/common/main/resources/less/colorpalette.less +++ b/apps/common/main/resources/less/colorpalette.less @@ -7,7 +7,7 @@ &:hover, &.selected { - .box-shadow(0 0 0 1px @primary); + .box-shadow(0 0 0 1px @highlight-button-pressed); } } } diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index a50be5477..50311e41a 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -86,7 +86,7 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; a { color: @dropdown-link-active-color; @@ -95,7 +95,7 @@ &.hover, &:focus, &.focus { - background-color: @primary; + background-color: @highlight-button-pressed; } } } diff --git a/apps/common/main/resources/less/dataview.less b/apps/common/main/resources/less/dataview.less index 6bcc32f1c..77cfe145b 100644 --- a/apps/common/main/resources/less/dataview.less +++ b/apps/common/main/resources/less/dataview.less @@ -26,7 +26,7 @@ &:hover, &.selected { - .box-shadow(0 0 0 2px @primary); + .box-shadow(0 0 0 2px @highlight-button-pressed); } } @@ -62,7 +62,7 @@ &:hover:not(.disabled), &.selected:not(.disabled) { - .box-shadow(0 0 0 2px @primary); + .box-shadow(0 0 0 2px @highlight-button-pressed); } } } diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 47c0d2bed..67dbf10fa 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -80,7 +80,7 @@ .no-checkmark.checked { .menu-item-icon { - background-color: @primary; + background-color: @highlight-button-pressed; border-radius: 2px; } } diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index 113853775..8108d7ac2 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -73,7 +73,7 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; .user-name, .user-date { @@ -104,7 +104,7 @@ display: inline-block; max-width: 60px; height: 18px; - color: @primary; + color: @highlight-button-pressed; font-size: 10px; white-space: nowrap; overflow: hidden; diff --git a/apps/common/main/resources/less/language-dialog.less b/apps/common/main/resources/less/language-dialog.less index 8c7338f09..3c82f1a58 100644 --- a/apps/common/main/resources/less/language-dialog.less +++ b/apps/common/main/resources/less/language-dialog.less @@ -23,7 +23,7 @@ li { &:before { display: none; } - background-color: @primary; + background-color: @highlight-button-pressed; &, &:hover, &:focus { color: @dropdown-link-active-color; diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less index 9a81c72fe..fd29b5d21 100644 --- a/apps/common/main/resources/less/listview.less +++ b/apps/common/main/resources/less/listview.less @@ -48,9 +48,9 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; color: #fff; - border-color: @primary; + border-color: @highlight-button-pressed; border-style: solid; border-width: 1px 0; } diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index dae4b2066..3f246f4a3 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -30,7 +30,7 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; color: #fff; } } diff --git a/apps/common/main/resources/less/switcher.less b/apps/common/main/resources/less/switcher.less index d2606b820..cbfcd3091 100644 --- a/apps/common/main/resources/less/switcher.less +++ b/apps/common/main/resources/less/switcher.less @@ -8,7 +8,7 @@ .sw-left { display: inline-block; height: 100%; - background-color: @primary; + background-color: @highlight-button-pressed; border-top-left-radius: 2px; border-bottom-left-radius: 2px; } @@ -28,7 +28,7 @@ top: 0; height: 100%; background-color: #ffffff; - border: 1px solid @primary; + border: 1px solid @highlight-button-pressed; border-radius: 3px; } diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 3705f4344..1c7e3435e 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -400,7 +400,7 @@ &:active, &.active { &:not(.disabled) { - background-color: @primary; + background-color: @highlight-button-pressed; svg.icon { fill: #fff; diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less index 07dc7ff4b..b13660ffa 100644 --- a/apps/common/main/resources/less/variables.less +++ b/apps/common/main/resources/less/variables.less @@ -21,8 +21,8 @@ //@gray-lighter: #ededed; //rgb(237, 237, 237) //@gray-soft: #adadad; //rgb(173, 173, 173) -@primary: #7d858c; //rgb(125, 133, 140) -@primary-hover: #666d73; //rgb(102, 109, 115) +//@primary: #7d858c; //rgb(125, 133, 140) +//@primary-hover: #666d73; //rgb(102, 109, 115) //@secondary: #d8dadc; //rgb(216, 218, 220) //@secondary-hover: #cbced1; //rgb(203, 206, 209) @@ -114,7 +114,7 @@ @border-radius-small: 2px; @component-active-color: #fff; -@component-active-bg: @primary; +@component-active-bg: #7d858c; // @primary; @caret-width-base: 4px; @caret-width-large: 5px; diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index bd7995b3a..bccd99630 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -24,7 +24,7 @@ &.active:not(.disabled) { outline: 0; - background-color: @primary; + background-color: @highlight-button-pressed; > a { color: #fff; @@ -303,7 +303,7 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; color: @dropdown-link-active-color; } } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 92c37c106..c65cd8464 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -53,7 +53,7 @@ &:hover, &.selected { - .box-shadow(0 0 0 2px @primary); + .box-shadow(0 0 0 2px @highlight-button-pressed); } } @@ -61,7 +61,7 @@ background-color: transparent; div { - .box-shadow(0 0 0 2px @primary); + .box-shadow(0 0 0 2px @highlight-button-pressed); } } } @@ -104,7 +104,7 @@ display: none !important; } &, &:hover, &:focus { - background-color: @primary; + background-color: @highlight-button-pressed; color: @dropdown-link-active-color; span.color { border-color: rgba(255,255,255,0.7); diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 61ce10a2b..5e440103a 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -108,7 +108,7 @@ &.active { outline: 0; - background-color: @primary; + background-color: @highlight-button-pressed; > a { color: #fff; @@ -372,7 +372,7 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; color: @dropdown-link-active-color; } } diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 3c7f097db..5ff8e21e3 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -25,7 +25,7 @@ &:hover, &.selected { .layout > div:first-child { - .box-shadow(0 0 0 2px @primary); + .box-shadow(0 0 0 2px @highlight-button-pressed); } } } @@ -76,7 +76,7 @@ display: none !important; } &, &:hover, &:focus { - background-color: @primary; + background-color: @highlight-button-pressed; color: @dropdown-link-active-color; span.color { border-color: rgba(255,255,255,0.7); diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index bfff41d95..0e00ca34f 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -108,7 +108,7 @@ &.active:not(.disabled) { outline: 0; - background-color: @primary; + background-color: @highlight-button-pressed; > a { color: #fff; @@ -236,7 +236,7 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; color: @dropdown-link-active-color; .settings-icon { @@ -436,7 +436,7 @@ } &.selected { - background-color: @primary; + background-color: @highlight-button-pressed; color: @dropdown-link-active-color; } } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 7a10b21b5..48f3e06a5 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -64,7 +64,7 @@ display: none !important; } &, &:hover, &:focus { - background-color: @primary; + background-color: @highlight-button-pressed; color: @dropdown-link-active-color; span.color { border-color: rgba(255,255,255,0.7);