diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index ab5245c66..7094343bf 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1233,7 +1233,7 @@ define([
reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api).loadDocument({doc:me.document});
var transitController = application.getController('Transitions');
- transitController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api).loadDocument({doc:me.document});
+ transitController.setMode(me.appOptions).setConfig(me.api);
if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode)
var toolbarController = application.getController('Toolbar');
diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js
index e5abf43c0..158908858 100644
--- a/apps/presentationeditor/main/app/controller/Transitions.js
+++ b/apps/presentationeditor/main/app/controller/Transitions.js
@@ -80,7 +80,7 @@ define([
this._state = {};
//Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
- setConfig: function (data, api) {
+ setConfig: function ( api) {
this.setApi(api);
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this));
return this;
diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index 284a89a3b..b70a2d236 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -4,7 +4,7 @@
<%= tabsmarkup %>
- %
+
diff --git a/apps/presentationeditor/main/app/template/Transitions.template b/apps/presentationeditor/main/app/template/Transitions.template
index 6477fa479..c3d5cab86 100644
--- a/apps/presentationeditor/main/app/template/Transitions.template
+++ b/apps/presentationeditor/main/app/template/Transitions.template
@@ -1,5 +1,5 @@
-
+
@@ -7,30 +7,30 @@
-
<%=Duration%>
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js
index 47423051e..03de193d5 100644
--- a/apps/presentationeditor/main/app/view/Transitions.js
+++ b/apps/presentationeditor/main/app/view/Transitions.js
@@ -195,15 +195,9 @@ define([
this.listEffects.fieldPicker.itemTemplate = _.template([
'
',
- '
'
].join(''));
diff --git a/apps/presentationeditor/main/resources/less/transitions.less b/apps/presentationeditor/main/resources/less/transitions.less
index 0fc52b604..33aeeb9f5 100644
--- a/apps/presentationeditor/main/resources/less/transitions.less
+++ b/apps/presentationeditor/main/resources/less/transitions.less
@@ -2,6 +2,7 @@
.item {
background: transparent;
border-color: transparent;
+ .box-shadow(none);
border-radius: @scaled-one-px-value-ie;
border-radius: @scaled-one-px-value;
border-width: calc(2*@scaled-one-px-value-ie) ;
@@ -9,11 +10,9 @@
&:hover{
border-color: @border-preview-hover-ie;
border-color: @border-preview-hover;
- box-shadow: none;
}
&.selected
{
- box-shadow: none;
border-color: @border-preview-select-ie;
border-color: @border-preview-select;
}
@@ -23,18 +22,15 @@
}
.btn {
-
+ border: none;
&:hover {
background-color: transparent;
}
- .inner-box-icon
+ .icon
{
margin-top: -2px;
}
- .inner-box-caption
- {
- padding-bottom: 10px;
- }
+
}
}
}
\ No newline at end of file