diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index a52c77b75..cc3cb36b8 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -21,11 +21,6 @@ &.input-group-nr > .form-control { padding-right: 7px + 2 * @padding-base-horizontal; - - &:focus, - &:focus ~ button.dropdown-toggle { - border-color: @gray-darker; - } } &.input-group-nr > .btn { @@ -71,13 +66,20 @@ border-color: @input-border; } - &.input-group-nr.open { + &.input-group-nr.open:not(.no-highlighted) { & > .form-control, & > .btn { border-color: @gray-darker; } } + &.input-group-nr:not(.no-highlighted) > .form-control { + &:focus, + &:focus ~ button.dropdown-toggle { + border-color: @gray-darker; + } + } + li { a { white-space: pre; @@ -129,3 +131,12 @@ position: fixed; } } + +.open > .combobox.combo-dataview-menu { + &.input-group-nr:not(.no-highlighted) { + & > .form-control, + & > .btn { + border-color: @gray-darker; + } + } +} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index f80251533..61b3fa875 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -283,7 +283,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', var combo = new Common.UI.ComboBox({ el : cmpEl.find('#sort-dialog-cmb-col-' + i), editable : false, - cls : 'input-group-nr', + cls : 'input-group-nr no-highlighted', menuCls : 'menu-absolute', menuStyle : 'max-height: 135px;', data : this.column_data @@ -305,7 +305,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', combo = new Common.UI.ComboBox({ el : cmpEl.find('#sort-dialog-cmb-sort-' + i), editable : false, - cls : 'input-group-nr', + cls : 'input-group-nr no-highlighted', menuCls : 'menu-absolute', data : this.sort_data }).on('selected', function(combo, record) { @@ -322,6 +322,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', el : cmpEl.find('#sort-dialog-btn-color-' + i), editable : false, menuCls : 'menu-absolute', + cls : 'no-highlighted', menuStyle : 'max-height: 135px;', data : level.color_data }).on('selected', function(combo, record) { @@ -337,7 +338,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', combo = new Common.UI.ComboBox({ el : cmpEl.find('#sort-dialog-cmb-order-' + i), editable : false, - cls : 'input-group-nr', + cls : 'input-group-nr no-highlighted', menuCls : 'menu-absolute', data : level.order_data }).on('selected', function(combo, record) {