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

Fix combobox styles

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-19 15:48:26 +03:00
parent 062a890b20
commit 98cb252112
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,16 +68,19 @@
} }
} }
&.input-group-nr.open:not(.no-highlighted) { &.input-group-nr.open {
& > .form-control, & > .form-control,
& > .btn { & > .btn {
border-color: @border-control-focus-ie;
border-color: @border-control-focus;
.caret { .caret {
transform: rotate(45deg); 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 { &.input-group-nr:not(.no-highlighted) > .form-control {
@ -87,6 +90,13 @@
border-color: @border-control-focus; 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 { li {
a { a {
@ -173,4 +183,13 @@
border-color: @border-control-focus; border-color: @border-control-focus;
} }
} }
&.input-group-nr {
& > .form-control,
& > .btn {
.caret {
transform: rotate(45deg);
}
}
}
} }

4
apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js
View file

@ -193,7 +193,7 @@ define([
'<div class="list-item" style="width: 100%;" id="chart-type-dlg-item-<%= seriesIndex %>">', '<div class="list-item" style="width: 100%;" id="chart-type-dlg-item-<%= seriesIndex %>">',
'<div style="width:8px;height:12px;display: inline-block;vertical-align: middle;" id="chart-type-dlg-series-preview-<%= seriesIndex %>"></div>', '<div style="width:8px;height:12px;display: inline-block;vertical-align: middle;" id="chart-type-dlg-series-preview-<%= seriesIndex %>"></div>',
'<div style="width:95px;padding-left: 5px;display: inline-block;vertical-align: middle;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;"><%= value %></div>', '<div style="width:95px;padding-left: 5px;display: inline-block;vertical-align: middle;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;"><%= value %></div>',
'<div style="width: 110px;padding-left: 5px;display: inline-block;vertical-align: middle;color: initial;"><div id="chart-type-dlg-cmb-series-<%= seriesIndex %>" class="input-group-nr" style=""></div></div>', '<div style="width: 110px;padding-left: 5px;display: inline-block;vertical-align: middle;"><div id="chart-type-dlg-cmb-series-<%= seriesIndex %>" class="input-group-nr" style=""></div></div>',
'<div style="padding-left: 55px;display: inline-block;vertical-align: middle;"><div id="chart-type-dlg-chk-series-<%= seriesIndex %>" style=""></div></div>', '<div style="padding-left: 55px;display: inline-block;vertical-align: middle;"><div id="chart-type-dlg-chk-series-<%= seriesIndex %>" style=""></div></div>',
'</div>' '</div>'
].join('')) ].join(''))
@ -388,7 +388,7 @@ define([
template: _.template([ template: _.template([
'<span class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle no-highlighted" tabindex="0" data-toggle="dropdown">', '<span class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle no-highlighted" tabindex="0" data-toggle="dropdown">',
'<input type="text" class="form-control" spellcheck="false">', '<input type="text" class="form-control" spellcheck="false">',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-target="' + id + '"><span class="caret img-commonctrl"></span></button>', '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-target="' + id + '"><span class="caret"></span></button>',
'</span>' '</span>'
].join('')) ].join(''))
}); });