diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index c2a7c5a8a..e44ea1f4d 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -68,16 +68,19 @@ } } - &.input-group-nr.open:not(.no-highlighted) { + &.input-group-nr.open { & > .form-control, & > .btn { - border-color: @border-control-focus-ie; - border-color: @border-control-focus; - .caret { transform: rotate(45deg); } } + + &:not(.no-highlighted) > .form-control, + &:not(.no-highlighted) > .btn { + border-color: @border-control-focus-ie; + border-color: @border-control-focus; + } } &.input-group-nr:not(.no-highlighted) > .form-control { @@ -87,6 +90,13 @@ border-color: @border-control-focus; } } + &.input-group-nr.no-highlighted > .form-control { + &:focus, + &:focus ~ button.dropdown-toggle { + border-color: @border-regular-control-ie; + border-color: @border-regular-control; + } + } li { a { @@ -173,4 +183,13 @@ border-color: @border-control-focus; } } + + &.input-group-nr { + & > .form-control, + & > .btn { + .caret { + transform: rotate(45deg); + } + } + } } diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 0fdeeef17..300bce505 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -193,7 +193,7 @@ define([ '