diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index 57f4aacdf..54b027aa4 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -237,9 +237,8 @@ define([ if ( $boxTabs.parent().hasClass('short') ) { $boxTabs.parent().removeClass('short'); } - + this.hideMoreBtns(); this.processPanelVisible(); - // this.resizeToolbar(); }, onTabClick: function (e) { @@ -514,7 +513,7 @@ define([ btnsMore[tab].on('toggle', function(btn, state, e) { (state) ? me.onMoreShow(btn, e) : me.onMoreHide(btn, e); }); - var moreContainer = $(''); + var moreContainer = $(''); optsFold.$bar.append(moreContainer); btnsMore[tab].panel = moreContainer.find('div'); } diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 079dcbe92..65a02ee28 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -342,9 +342,14 @@ .combo-template(60px); top: -7px; - padding-right: 24px; + padding-right: 12px; position: absolute; + .more-container & { + padding-right: 0; + position: static; + } + .view .dataview, .dropdown-menu { padding: 1px; } diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 0f8be35af..d86c0f973 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -204,7 +204,7 @@ background-color: @background-toolbar-ie; background-color: @background-toolbar; min-width:auto; - padding: 10px 10px 5px 0; + padding: 12px 10px 7px 0; border-radius: 0; z-index:999; .compactwidth { @@ -220,6 +220,9 @@ } } } + &[data-tab=pivot] { + padding: 5px 10px 0 0; + } } .more-box { diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 9043c9ba5..460181953 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -87,7 +87,7 @@ define([ '' + '' + '' + - '
' + + '
' + '
' + '';