diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 382d03dbf..e07d4ea9e 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -99,8 +99,8 @@ .button-otherstates-icon(@icon-class, @icon-size) { button.over > .@{icon-class} {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);} button.active > .@{icon-class}, - button:active > .@{icon-class} {background-position-x: -2*@icon-size; --bgX: -(2*@icon-size);} - button.disabled > .@{icon-class} {background-position-x: -3*@icon-size; --bgX: -(3*@icon-size);} + button:active > .@{icon-class} {background-position-x: -2*@icon-size !important; --bgX: -(2*@icon-size);} + button.disabled > .@{icon-class} {background-position-x: -3*@icon-size !important; --bgX: -(3*@icon-size);} } .button-otherstates-icon2(@icon-class, @icon-size) { diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 89da9000e..492ba1a13 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -60,6 +60,14 @@ background-position: @arrow-small-offset-x - 7px @arrow-small-offset-y; } } + + &:active, + &.active { + &:focus, + &.focus { + outline: none; + } + } } .btn-toolbar { @@ -79,8 +87,8 @@ display: none; } - &:hover, - .over { + &:hover:not(.disabled), + .over:not(.disabled) { background-color: @secondary; } @@ -141,8 +149,8 @@ background-color: transparent; font-weight: bold; - &:hover, - .over { + &:hover:not(.disabled), + .over:not(.disabled) { background-color: @secondary; } @@ -312,13 +320,13 @@ border: 1px solid @input-border; .border-radius(@border-radius-small); - &:hover, - .over { + &:hover:not(.disabled), + .over:not(.disabled) { background-color: @secondary !important; } - &:active, - &.active { + &:active:not(.disabled), + &.active:not(.disabled) { background-color: @primary !important; color: white; } @@ -346,13 +354,13 @@ margin-top: 5px; } - &:hover, - .over { + &:hover:not(.disabled), + .over:not(.disabled) { background-color: @secondary !important; } - &:active, - &.active { + &:active:not(.disabled), + &.active:not(.disabled) { background-color: @primary !important; color: white; } @@ -379,13 +387,13 @@ background-repeat: no-repeat; } - &:hover, - .over { + &:hover:not(.disabled), + .over:not(.disabled) { background-color: @secondary !important; } - &:active, - &.active { + &:active:not(.disabled), + &.active:not(.disabled) { background-color: @primary !important; } diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index 061442ec9..36c1bac20 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -36,9 +36,14 @@ .form-control { .border-right-radius(0); border-right: 0; + position: initial; + z-index: initial; + float: none; } - .btn { + .btn, + .btn:hover, + .btn:focus { .border-left-radius(0); border-left: 0; border-color: @input-border; diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 157a9e79c..cc0762c42 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -1,8 +1,5 @@ .dropdown-menu > .disabled > a { - &:hover, - &:focus { - cursor: default; - } + cursor: default; } .dropdown-menu { diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 4c4547e06..58c80a308 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -194,14 +194,14 @@ .btn-edit-table {background-position: 0 0;} button.over .btn-edit-table {background-position: -28px 0;} .btn-group.open .btn-edit-table, -button.active .btn-edit-table, -button:active .btn-edit-table {background-position: -56px 0;} +button.active:not(.disabled) .btn-edit-table, +button:active:not(.disabled) .btn-edit-table {background-position: -56px 0;} .btn-change-shape {background-position: 0 -16px;} button.over .btn-change-shape {background-position: -28px -16px;} .btn-group.open .btn-change-shape, -button.active .btn-change-shape, -button:active .btn-change-shape {background-position: -56px -16px;} +button.active:not(.disabled) .btn-change-shape, +button:active:not(.disabled) .btn-change-shape {background-position: -56px -16px;} .combo-pattern-item { .background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px); diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 2afce7d10..329f1538c 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -58,6 +58,9 @@ white-space: nowrap; padding-top: 3px; vertical-align: top; + &.dropup { + position: initial; + } } .separator {