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

Changed expanded list style

Browse source
This commit is contained in:
Basher 2022-07-20 19:16:55 +03:00
parent 9c143ec001
commit c75c9941c0
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1307,6 +1307,7 @@ define([
if (menu.cmpEl) { if (menu.cmpEl) {
var itemEl = $(menu.menuRoot.find('.dataview .item').get(0)); var itemEl = $(menu.menuRoot.find('.dataview .item').get(0));
var groupContainerEl = $(menu.menuRoot.find('.dataview .group-items-container').get(0));
var itemMargin = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right')); var itemMargin = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right'));
Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = -1/Common.Utils.applicationPixelRatio()); Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = -1/Common.Utils.applicationPixelRatio());
var itemWidth = itemEl.is(':visible') ? parseFloat(itemEl.css('width')) : var itemWidth = itemEl.is(':visible') ? parseFloat(itemEl.css('width')) :
@ -1321,7 +1322,7 @@ define([
menu.menuAlign = 'tl-tl'; menu.menuAlign = 'tl-tl';
var dataviewEl = $(menu.menuRoot.find('.dataview').get(0)); var dataviewEl = $(menu.menuRoot.find('.dataview').get(0));
var menuWidth = columnCount * (itemWidth + itemMargin) + parseFloat(dataviewEl.css('padding-left')) + parseFloat(dataviewEl.css('padding-right')); var menuWidth = + columnCount * (itemWidth + itemMargin) + parseFloat(groupContainerEl.css('padding-left')) + parseFloat(groupContainerEl.css('padding-right')) + parseFloat(dataviewEl.css('padding-left')) + parseFloat(dataviewEl.css('padding-right'));
var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menuWidth - 1; var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menuWidth - 1;
menu.setOffset(Math.min(offset, 0)); menu.setOffset(Math.min(offset, 0));

10
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -149,15 +149,21 @@
.combo-styles { .combo-styles {
.menu-picker-container .dataview { .menu-picker-container .dataview {
padding: 10px 2px 0 2px; padding: 10px 15px 0 5px;
} }
.group-description { .group-description {
padding: 3px 0 3px 10px; padding: 3px 0 3px 10px;
.font-weight-bold(); .font-weight-bold();
} }
.group-items-container {
padding-bottom: 1px;
padding-right: 1px;
}
.grouped-data .group-items-container .item { .grouped-data .group-items-container .item {
margin: 0px -1px -1px 0px;
box-shadow: none; box-shadow: none;
&:hover { &:hover {
.box-shadow(inset 0 0 0 2px @border-preview-hover-ie) !important; .box-shadow(inset 0 0 0 2px @border-preview-hover-ie) !important;