diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 59317d9bc..a2692882c 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -297,7 +297,7 @@ &:hover:not(.disabled), .over:not(.disabled) { - background-color: @secondary; + background-color: @highlight-button-hover; } @@ -377,7 +377,7 @@ &:hover:not(.disabled), .over:not(.disabled) { - background-color: @secondary; + background-color: @highlight-button-hover; } &:active:not(.disabled), @@ -447,7 +447,7 @@ &.over { > button { - //background-color: @secondary; + //background-color: @highlight-button-hover; } } @@ -490,7 +490,6 @@ } } -@color-gray: @secondary; @color-dark: @primary; //@color-gray: #079e2f; //@color-dark: #c52c0e; @@ -499,7 +498,7 @@ &.over:not(.disabled), &.open { - box-shadow: inset 0 0 0 1px @color-gray; + box-shadow: inset 0 0 0 1px @highlight-button-hover; button:not(.active):not(.btn-text-split-default) { background-color: transparent; @@ -510,7 +509,7 @@ button { &:not(.active) { &:hover { - background-color: @color-gray; + background-color: @highlight-button-hover; } } @@ -622,7 +621,7 @@ &:hover, &.over { - background-color: @secondary; + background-color: @highlight-button-hover; } &:active, @@ -646,7 +645,7 @@ &:hover:not(.disabled), .over:not(.disabled) { - background-color: @secondary !important; + background-color: @highlight-button-hover !important; } &:active:not(.disabled), @@ -681,7 +680,7 @@ &:hover:not(.disabled), .over:not(.disabled) { - background-color: @secondary !important; + background-color: @highlight-button-hover !important; } &:active:not(.disabled), @@ -713,7 +712,7 @@ &:hover:not(.disabled), .over:not(.disabled) { - background-color: @secondary !important; + background-color: @highlight-button-hover !important; } &:active:not(.disabled), @@ -751,7 +750,7 @@ &:hover:not(.disabled), .over:not(.disabled) { - background-color: @secondary !important; + background-color: @highlight-button-hover !important; } &:active:not(.disabled), @@ -835,11 +834,11 @@ font-weight: bold; width: 86px; color: @text-normal; - background-color: @secondary; + background-color: @highlight-button-hover; &:hover:not(.disabled), &.hover:not(.disabled) { - background-color: @secondary-hover; + background-color: @highlight-button-hover; } &.primary { diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index a5a4f5418..113853775 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -21,7 +21,7 @@ cursor: pointer; &:hover { - background-color: @secondary; + background-color: @highlight-button-hover; } } } @@ -44,7 +44,7 @@ cursor: pointer; &:hover { - background-color: @secondary; + background-color: @highlight-button-hover; } } } @@ -64,7 +64,7 @@ &:hover:not(.selected), &.over { - background-color: @secondary; + background-color: @highlight-button-hover; .user-version { color: #fff; diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less index 7c4861267..9a81c72fe 100644 --- a/apps/common/main/resources/less/listview.less +++ b/apps/common/main/resources/less/listview.less @@ -41,8 +41,8 @@ &:not(.disabled) > .item { &:hover { - background-color: @secondary; - border-color: @secondary; + background-color: @highlight-button-hover; + border-color: @highlight-button-hover; 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 01fc0515f..dae4b2066 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -26,7 +26,7 @@ &:hover, &.over { - background-color: @secondary; + background-color: @highlight-button-hover; } &.selected { diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index ec514cf02..3705f4344 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -338,7 +338,7 @@ &:hover:not(.active) { background-color: rgba(0, 0, 0, .05); - //background-color: @secondary; + //background-color: @highlight-button-hover; } > a { @@ -395,7 +395,7 @@ } &:hover:not(.disabled) { - background-color: @secondary; + background-color: @highlight-button-hover; } &:active, &.active { diff --git a/apps/common/main/resources/less/treeview.less b/apps/common/main/resources/less/treeview.less index d1630a6e6..9193ab972 100644 --- a/apps/common/main/resources/less/treeview.less +++ b/apps/common/main/resources/less/treeview.less @@ -31,7 +31,7 @@ &:hover, &.over { - background-color: @secondary; + background-color: @highlight-button-hover; } &.selected { diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less index 6c07976d0..07dc7ff4b 100644 --- a/apps/common/main/resources/less/variables.less +++ b/apps/common/main/resources/less/variables.less @@ -23,8 +23,8 @@ @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) +//@secondary: #d8dadc; //rgb(216, 218, 220) +//@secondary-hover: #cbced1; //rgb(203, 206, 209) @black: #000000; @@ -218,7 +218,7 @@ @dropdown-link-color: #444; // @gray-deep; @dropdown-link-hover-color: darken(#444, 5%); // darken(@gray-deep, 5%); -@dropdown-link-hover-bg: @secondary; +@dropdown-link-hover-bg: #d8dadc; // @secondary; @dropdown-link-active-color: @component-active-color; @dropdown-link-active-bg: @component-active-bg; diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 0e0ab7ee7..bd7995b3a 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -19,7 +19,7 @@ margin-bottom: 3px; &:hover:not(.disabled) { - background-color: @secondary; + background-color: @highlight-button-hover; } &.active:not(.disabled) { diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 1080e9e26..5953bc833 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -255,7 +255,7 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - &:hover, &.over { - background-color: @secondary; + background-color: @highlight-button-hover; .caret { display: inline-block; diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 15e8e4bfa..61ce10a2b 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -103,7 +103,7 @@ margin-bottom: 3px; &:hover { - background-color: @secondary; + background-color: @highlight-button-hover; } &.active { diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index cde91a8ec..859a2f985 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -188,7 +188,7 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - &:hover, &.over { - background-color: @secondary; + background-color: @highlight-button-hover; .caret { display: inline-block; diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less index 76db9ad23..efbf4c38f 100644 --- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less +++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less @@ -21,8 +21,8 @@ .item { &.selected { - background-color: @secondary; - border-color: @secondary; + background-color: @highlight-button-hover; + border-color: @highlight-button-hover; color: @text-normal; border-style: solid; border-width: 1px 0; diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index d0c99b6ab..bfff41d95 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -103,7 +103,7 @@ margin-bottom: 3px; &:hover:not(.disabled) { - background-color: @secondary; + background-color: @highlight-button-hover; } &.active:not(.disabled) { diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index ef94b8a31..f091d0a1b 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -258,7 +258,7 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - &:hover, &.over { - background-color: @secondary; + background-color: @highlight-button-hover; .caret { display: inline-block;