Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix style for focused input controls

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-09 14:19:26 +03:00
parent b4026f1eeb
commit 9a81f52ec5
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/common/main/resources/less/combobox.less
View file

@ -21,11 +21,6 @@
&.input-group-nr > .form-control { &.input-group-nr > .form-control {
padding-right: 7px + 2 * @padding-base-horizontal; padding-right: 7px + 2 * @padding-base-horizontal;
&:focus,
&:focus ~ button.dropdown-toggle {
border-color: @gray-darker;
}
} }
&.input-group-nr > .btn { &.input-group-nr > .btn {
@ -71,13 +66,20 @@
border-color: @input-border; border-color: @input-border;
} }
&.input-group-nr.open { &.input-group-nr.open:not(.no-highlighted) {
& > .form-control, & > .form-control,
& > .btn { & > .btn {
border-color: @gray-darker; border-color: @gray-darker;
} }
} }
&.input-group-nr:not(.no-highlighted) > .form-control {
&:focus,
&:focus ~ button.dropdown-toggle {
border-color: @gray-darker;
}
}
li { li {
a { a {
white-space: pre; white-space: pre;
@ -129,3 +131,12 @@
position: fixed; position: fixed;
} }
} }
.open > .combobox.combo-dataview-menu {
&.input-group-nr:not(.no-highlighted) {
& > .form-control,
& > .btn {
border-color: @gray-darker;
}
}
}

7
apps/spreadsheeteditor/main/app/view/SortDialog.js
View file

@ -283,7 +283,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
var combo = new Common.UI.ComboBox({ var combo = new Common.UI.ComboBox({
el : cmpEl.find('#sort-dialog-cmb-col-' + i), el : cmpEl.find('#sort-dialog-cmb-col-' + i),
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr no-highlighted',
menuCls : 'menu-absolute', menuCls : 'menu-absolute',
menuStyle : 'max-height: 135px;', menuStyle : 'max-height: 135px;',
data : this.column_data data : this.column_data
@ -305,7 +305,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
combo = new Common.UI.ComboBox({ combo = new Common.UI.ComboBox({
el : cmpEl.find('#sort-dialog-cmb-sort-' + i), el : cmpEl.find('#sort-dialog-cmb-sort-' + i),
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr no-highlighted',
menuCls : 'menu-absolute', menuCls : 'menu-absolute',
data : this.sort_data data : this.sort_data
}).on('selected', function(combo, record) { }).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), el : cmpEl.find('#sort-dialog-btn-color-' + i),
editable : false, editable : false,
menuCls : 'menu-absolute', menuCls : 'menu-absolute',
cls : 'no-highlighted',
menuStyle : 'max-height: 135px;', menuStyle : 'max-height: 135px;',
data : level.color_data data : level.color_data
}).on('selected', function(combo, record) { }).on('selected', function(combo, record) {
@ -337,7 +338,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
combo = new Common.UI.ComboBox({ combo = new Common.UI.ComboBox({
el : cmpEl.find('#sort-dialog-cmb-order-' + i), el : cmpEl.find('#sort-dialog-cmb-order-' + i),
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr no-highlighted',
menuCls : 'menu-absolute', menuCls : 'menu-absolute',
data : level.order_data data : level.order_data
}).on('selected', function(combo, record) { }).on('selected', function(combo, record) {