diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index 3f27510cf..955cd024b 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -220,10 +220,10 @@ define([ if (me.btnParametrs.menu) { value = transition.get_TransitionOption(); - if (this._state.EffectType !== value) { + //if (this._state.EffectType !== value) {*/ me.setMenuParametrs(this._state.Effect, value); this._state.EffectType = value; - } + //} } value = transition.get_TransitionDuration(); diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index da64a56bf..8ceb4d188 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -343,25 +343,25 @@ define([ minMax=[0,1]; break; case Asc.c_oAscSlideTransitionTypes.Push: - minMax=[2, 6]; + minMax=[2, 5]; break; case Asc.c_oAscSlideTransitionTypes.Wipe: - minMax=[2, 10]; + minMax=[2, 9]; break; case Asc.c_oAscSlideTransitionTypes.Split: - minMax=[10, 14]; + minMax=[10, 13]; break; case Asc.c_oAscSlideTransitionTypes.UnCover: - minMax=[2, 10]; + minMax=[2, 9]; break; case Asc.c_oAscSlideTransitionTypes.Cover: - minMax=[2, 10]; + minMax=[2, 9]; break; case Asc.c_oAscSlideTransitionTypes.Clock: - minMax=[14, 17]; + minMax=[14, 16]; break; case Asc.c_oAscSlideTransitionTypes.Zoom: - minMax=[17,17]; + minMax=[17,19]; break; } var selectedElement; diff --git a/apps/presentationeditor/main/resources/less/Transitions.less b/apps/presentationeditor/main/resources/less/Transitions.less index ece20332e..4e7b1a57a 100644 --- a/apps/presentationeditor/main/resources/less/Transitions.less +++ b/apps/presentationeditor/main/resources/less/Transitions.less @@ -4,7 +4,7 @@ } .item { - + background: transparent; border-color: transparent; border-width: calc(2*@scaled-one-px-value-ie) ; border-width: calc(@scaled-two-px-value); @@ -17,7 +17,13 @@ border-color: @border-preview-select-ie; border-color: @border-preview-select; } + //menu-picker-container + .style{ + background: transparent; + } + .btn { + &:hover { background-color: transparent; }