diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 55f461d75..a9452b03e 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -171,8 +171,8 @@ define([ this.listEffects.fieldPicker.itemTemplate = _.template([ '
', - '
', - '
', + '
', + '
', '
<%= title %>
', '
', '
' @@ -180,10 +180,10 @@ define([ this.listEffects.menuPicker.itemTemplate = this.listEffects.fieldPicker.itemTemplate; this.btnPreview = new Common.UI.Button({ - cls: 'btn-toolbar ', // x-huge icon-top', + cls: 'btn-toolbar', // x-huge icon-top', caption: this.txtPreview, split: false, - iconCls: 'toolbar__icon btn-preview', + iconCls: 'toolbar__icon preview-transitions', lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.btnPreview); @@ -191,7 +191,7 @@ define([ this.btnParameters = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', caption: this.txtParameters, - iconCls: 'toolbar__icon icon btn-insertshape', + iconCls: 'toolbar__icon icon transition-fade', menu: new Common.UI.Menu({ items: this.createParametersMenuItems()}), lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] @@ -202,7 +202,7 @@ define([ cls: 'btn-toolbar', caption: this.txtApplyToAll, split: true, - iconCls: 'toolbar__icon btn-changeslide', + iconCls: 'toolbar__icon transition-apply-all', lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.btnApplyToAll); diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/preview-transitions.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/preview-transitions.png new file mode 100644 index 000000000..53264f2fb Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/preview-transitions.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/transition-apply-all.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/transition-apply-all.png new file mode 100644 index 000000000..4e3f0ea4d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/transition-apply-all.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/preview-transitions.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/preview-transitions.png new file mode 100644 index 000000000..f1dd8a463 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/preview-transitions.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/transition-apply-all.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/transition-apply-all.png new file mode 100644 index 000000000..09c2e7f4e Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/transition-apply-all.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/preview-transitions.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/preview-transitions.png new file mode 100644 index 000000000..aed85bb05 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/preview-transitions.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/transition-apply-all.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/transition-apply-all.png new file mode 100644 index 000000000..09c2e7f4e Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/transition-apply-all.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/preview-transitions.png b/apps/presentationeditor/main/resources/img/toolbar/1x/preview-transitions.png new file mode 100644 index 000000000..10d4b5f43 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/preview-transitions.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/transition-apply-all.png b/apps/presentationeditor/main/resources/img/toolbar/1x/transition-apply-all.png new file mode 100644 index 000000000..68b502e84 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/transition-apply-all.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/preview-transitions.png b/apps/presentationeditor/main/resources/img/toolbar/2x/preview-transitions.png new file mode 100644 index 000000000..84c1501d2 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/preview-transitions.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/transition-apply-all.png b/apps/presentationeditor/main/resources/img/toolbar/2x/transition-apply-all.png new file mode 100644 index 000000000..f4a7407cb Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/transition-apply-all.png differ