diff --git a/apps/common/main/resources/less/label.less b/apps/common/main/resources/less/label.less
index ffd4647ab..8f44c647b 100644
--- a/apps/common/main/resources/less/label.less
+++ b/apps/common/main/resources/less/label.less
@@ -8,7 +8,7 @@
height: 20px;
line-height: 20px;
padding: 0;
- margin: 0;
+ margin-top: -2px;
display: inline-block;
background-repeat: no-repeat;
vertical-align: middle;
diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index c0eeadd9c..65c6dc50c 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -151,8 +151,8 @@
-
-
+
+
@@ -165,7 +165,7 @@
diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js
index 338bdb1c6..bc013be60 100644
--- a/apps/presentationeditor/main/app/view/Transitions.js
+++ b/apps/presentationeditor/main/app/view/Transitions.js
@@ -233,6 +233,14 @@ define([
});
this.lockedControls.push(this.numDuration);
+ this.lblDuration = new Common.UI.Label({
+ el: this.$el.find('#transit-duration'),
+ iconCls: 'toolbar__icon animation-duration',
+ caption: this.strDuration,
+ lock: [_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock]
+ });
+ this.lockedControls.push(this.lblDuration);
+
this.numDelay = new Common.UI.MetricSpinner({
el: this.$el.find('#transit-spin-delay'),
step: 1,
@@ -270,7 +278,6 @@ define([
Common.Utils.lockControls(PE.enumLock.disableOnStart, true, {array: this.lockedControls});
- this.$el.find('#transit-duration').text(this.strDuration);
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
@@ -335,7 +342,6 @@ define([
this.renderComponent('#transit-spin-duration', this.numDuration);
this.renderComponent('#transit-spin-delay', this.numDelay);
this.renderComponent('#transit-checkbox-startonclick', this.chStartOnClick);
- this.$el.find("#label-duration").innerText = this.strDuration;
this.$el.find("#label-delay").innerText = this.strDelay;
return this.$el;
},
@@ -417,6 +423,7 @@ define([
this.btnParameters.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
+ this.lblDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
}
return (selectedElement)?selectedElement.value:-1;
},
@@ -429,7 +436,6 @@ define([
strDuration: 'Duration',
strDelay: 'Delay',
strStartOnClick: 'Start On Click',
-
textNone: 'None',
textFade: 'Fade',
textPush: 'Push',