From d02dea7ca59d3301c614989a6750664717009cbc Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 1 Mar 2021 00:29:00 +0300 Subject: [PATCH] [common] repaired disabled components stylesheets --- apps/common/main/resources/less/buttons.less | 23 +++++++++---------- apps/common/main/resources/less/checkbox.less | 2 -- .../resources/less/colors-table-dark.less | 1 + .../main/resources/less/colors-table.less | 2 ++ .../main/resources/less/combo-dataview.less | 2 +- apps/common/main/resources/less/common.less | 4 ++-- apps/common/main/resources/less/dataview.less | 2 +- .../main/resources/less/dropdown-menu.less | 6 ++++- apps/common/main/resources/less/header.less | 4 ++-- apps/common/main/resources/less/input.less | 2 +- apps/common/main/resources/less/listview.less | 2 +- apps/common/main/resources/less/radiobox.less | 2 -- apps/common/main/resources/less/slider.less | 2 +- apps/common/main/resources/less/spinner.less | 2 +- apps/common/main/resources/less/window.less | 2 +- .../main/resources/less/statusbar.less | 2 +- .../main/resources/less/toolbar.less | 2 +- 17 files changed, 32 insertions(+), 30 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index a6579d6fd..b513eba07 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -1,5 +1,4 @@ @x-huge-btn-height: 46px; -@btn-disabled-opacity: .4; @x-huge-btn-icon-size: 28px; .btn { @@ -40,7 +39,7 @@ } &[disabled] { - opacity: @btn-disabled-opacity; + opacity: @component-disabled-opacity; } &:focus { @@ -432,7 +431,7 @@ &[disabled], &.disabled { //color: #000; btn-category has no text - opacity: @btn-disabled-opacity; + opacity: @component-disabled-opacity; } } @@ -502,7 +501,7 @@ } &[disabled], &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } } @@ -519,7 +518,7 @@ .dropdown-menu { &.scale-menu { li.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } } } @@ -614,7 +613,7 @@ &[disabled], &.disabled { - opacity: 0.35; + opacity: @component-disabled-opacity; } .color-transparent { @@ -721,7 +720,7 @@ &[disabled], &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } } @@ -759,7 +758,7 @@ &[disabled], &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } } @@ -798,7 +797,7 @@ &[disabled], &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } } @@ -838,7 +837,7 @@ &[disabled], &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } } @@ -905,7 +904,7 @@ &[disabled], &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } } @@ -943,7 +942,7 @@ } &[disabled] { - opacity: 0.65; + opacity: @component-disabled-opacity; } &.custom { diff --git a/apps/common/main/resources/less/checkbox.less b/apps/common/main/resources/less/checkbox.less index 9b8b8e320..d74abea46 100644 --- a/apps/common/main/resources/less/checkbox.less +++ b/apps/common/main/resources/less/checkbox.less @@ -58,11 +58,9 @@ &.disabled, &:disabled { - opacity: .4; + label { &::before { - opacity: .4; } } } diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index c6d00ad0a..15159908d 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -106,6 +106,7 @@ --image-border-types-filter: invert(100%) brightness(4); --image-border-types-filter-selected: invert(100%) brightness(4); --component-normal-icon-filter: invert(100%); + --component-disabled-opacity: .3; --menu-icon-item-checked-offset-x: -20px; } diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 6d6cca53b..dd743c5cd 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -120,6 +120,7 @@ --image-border-types-filter: none; --image-border-types-filter-selected: none; --component-normal-icon-filter: none; + --component-disabled-opacity: .4; } // Background @@ -188,6 +189,7 @@ @button-header-active-icon-offset-x: var(--button-header-active-icon-offset-x, -20px); @component-normal-icon-filer: var(--component-normal-icon-filter); +@component-disabled-opacity: var(--component-disabled-opacity, .4); @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 63ce7c2df..d3cc6d36a 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -62,7 +62,7 @@ } &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; .dataview.inner { > .item { diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 44b6a116a..50d8faee9 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -20,7 +20,7 @@ label { } &.disabled { - opacity: 0.5; + opacity: @component-disabled-opacity; } } @@ -200,7 +200,7 @@ label { height: 100%; &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; cursor: default !important; } } diff --git a/apps/common/main/resources/less/dataview.less b/apps/common/main/resources/less/dataview.less index 3696c10f5..1c4c53fee 100644 --- a/apps/common/main/resources/less/dataview.less +++ b/apps/common/main/resources/less/dataview.less @@ -58,7 +58,7 @@ } &.disabled { - opacity: 0.5; + opacity: @component-disabled-opacity; } .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 3222f9618..325b28de9 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -1,5 +1,10 @@ .dropdown-menu > .disabled > a { cursor: default; + + color: @text-normal-ie; + color: @text-normal; + + opacity: @component-disabled-opacity; } .dropdown-menu { @@ -89,7 +94,6 @@ &.disabled { .menu-item-icon { - opacity: .4; } } diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 8e57409a1..a7995b8a8 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -197,7 +197,7 @@ } &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; pointer-events: none; } } @@ -359,7 +359,7 @@ .btn&[disabled], &.disabled { - opacity: 0.65; + opacity: @component-disabled-opacity; } &:hover { diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index 460422c33..9a7bc2b06 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -95,7 +95,7 @@ input.error { } .disabled .form-control { - opacity: 0.65; + opacity: @component-disabled-opacity; cursor: default !important; } diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less index 6110d76a7..8757d2a25 100644 --- a/apps/common/main/resources/less/listview.less +++ b/apps/common/main/resources/less/listview.less @@ -76,7 +76,7 @@ &.disabled { > .item { cursor: default; - opacity: 0.5; + opacity: @component-disabled-opacity; } } } diff --git a/apps/common/main/resources/less/radiobox.less b/apps/common/main/resources/less/radiobox.less index 980de206d..1c5355ccf 100644 --- a/apps/common/main/resources/less/radiobox.less +++ b/apps/common/main/resources/less/radiobox.less @@ -42,11 +42,9 @@ } &.disabled, &:disabled { - opacity: .4; + label { &::before { - opacity: .4; } } } diff --git a/apps/common/main/resources/less/slider.less b/apps/common/main/resources/less/slider.less index fefd2dfe1..ed156501b 100644 --- a/apps/common/main/resources/less/slider.less +++ b/apps/common/main/resources/less/slider.less @@ -39,6 +39,6 @@ } &.disabled { - opacity: 0.35; + opacity: @component-disabled-opacity; } } \ No newline at end of file diff --git a/apps/common/main/resources/less/spinner.less b/apps/common/main/resources/less/spinner.less index 62b2e0e28..73cb0cf4a 100644 --- a/apps/common/main/resources/less/spinner.less +++ b/apps/common/main/resources/less/spinner.less @@ -58,7 +58,7 @@ button { &.disabled { - opacity: .35; + opacity: @component-disabled-opacity; } &:hover { diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index b612a5e26..87745f2ce 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -134,7 +134,7 @@ } &.disabled { - opacity: 0.3; + opacity: @component-disabled-opacity; cursor: default; } } diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 6400575ed..38a3419c7 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -89,7 +89,7 @@ cursor: default; label { cursor: default; - opacity: 0.4; + opacity: @component-disabled-opacity; } } } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index dfcd8984e..ca446cd93 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -92,7 +92,7 @@ &.disabled { > .item { cursor: default; - opacity: 0.5; + opacity: @component-disabled-opacity; &:hover { .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie);