diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index af13108ba..72d5e9ed4 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -391,7 +391,8 @@ define([ if (!_flex) { _flex = []; _.each($active.find('.group.flex'), function(item) { - _flex.push($(item)); + var el = $(item); + _flex.push({el: el, width: el.attr('data-group-width') || el.attr('max-width')}); //save flex element and it's initial width }); data.flex = _flex; } @@ -399,7 +400,7 @@ define([ if ( _rightedge > _maxright) { if (_flex.length>0) { for (var i=0; i<_flex.length; i++) { - var item = _flex[i]; + var item = _flex[i].el; if (item.outerWidth() > parseInt(item.css('min-width'))) return; else @@ -433,7 +434,7 @@ define([ if (_flex.length>0 && $active.find('.btn-slot.compactwidth').length<1) { for (var i=0; i<_flex.length; i++) { var item = _flex[i]; - item.css('width', item.css('max-width')); + item.el.css('width', item.width); } } } diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index b4a79358b..cc442813c 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -281,6 +281,7 @@ .combo-template(60px); top: -7px; + padding-right: 24px; position: absolute; .view .dataview, .dropdown-menu { diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index abbc6ad38..d04201732 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -96,7 +96,7 @@ -
+