diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-background-plugins.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-background-plugins.svg new file mode 100644 index 0000000000..b2cd1dba48 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-background-plugins.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index a3d45a143d..14de270383 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -266,7 +266,7 @@ define([ if (this._state.Effect !== undefined) { var item = me.listEffects.store.findWhere({value: this._state.Effect}); me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]); - this.view.btnParameters.setIconCls('toolbar__icon icon ' + item.get('imageUrl')); + this.view.btnParameters.setIconCls('toolbar__icon ' + item.get('imageUrl')); } if (me.btnParameters.menu.getItemsLength() > 0 && this._state.EffectType !== undefined) diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 499e65116e..527f1ba7e0 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -146,7 +146,7 @@ define([ autoWidth: true, itemTemplate: _.template([ '
', - '
', + '
', '
<%= title %>
', '
' ].join('')), @@ -196,10 +196,9 @@ define([ this.lockedControls.push(this.btnPreview); this.btnParameters = new Common.UI.Button({ - cls: 'btn-toolbar x-huge icon-top', + cls: 'btn-toolbar x-huge icon-top', caption: this.txtParameters, - iconCls: 'toolbar__icon icon btn-transition-none', - scaling: false, + iconCls: 'toolbar__icon btn-transition-none', menu: new Common.UI.Menu({ items: this.createParametersMenuItems() }),