Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

edit setMenuParametrs

Browse source
This commit is contained in:
OVSharova 2021-07-26 14:52:56 +03:00
parent f18b8fea32
commit fd9e0e7fca
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/presentationeditor/main/app/controller/Transitions.js
View file

@ -220,10 +220,10 @@ define([
if (me.btnParametrs.menu) { if (me.btnParametrs.menu) {
value = transition.get_TransitionOption(); value = transition.get_TransitionOption();
if (this._state.EffectType !== value) { //if (this._state.EffectType !== value) {*/
me.setMenuParametrs(this._state.Effect, value); me.setMenuParametrs(this._state.Effect, value);
this._state.EffectType = value; this._state.EffectType = value;
} //}
} }
value = transition.get_TransitionDuration(); value = transition.get_TransitionDuration();

14
apps/presentationeditor/main/app/view/Transitions.js
View file

@ -343,25 +343,25 @@ define([
minMax=[0,1]; minMax=[0,1];
break; break;
case Asc.c_oAscSlideTransitionTypes.Push: case Asc.c_oAscSlideTransitionTypes.Push:
minMax=[2, 6]; minMax=[2, 5];
break; break;
case Asc.c_oAscSlideTransitionTypes.Wipe: case Asc.c_oAscSlideTransitionTypes.Wipe:
minMax=[2, 10]; minMax=[2, 9];
break; break;
case Asc.c_oAscSlideTransitionTypes.Split: case Asc.c_oAscSlideTransitionTypes.Split:
minMax=[10, 14]; minMax=[10, 13];
break; break;
case Asc.c_oAscSlideTransitionTypes.UnCover: case Asc.c_oAscSlideTransitionTypes.UnCover:
minMax=[2, 10]; minMax=[2, 9];
break; break;
case Asc.c_oAscSlideTransitionTypes.Cover: case Asc.c_oAscSlideTransitionTypes.Cover:
minMax=[2, 10]; minMax=[2, 9];
break; break;
case Asc.c_oAscSlideTransitionTypes.Clock: case Asc.c_oAscSlideTransitionTypes.Clock:
minMax=[14, 17]; minMax=[14, 16];
break; break;
case Asc.c_oAscSlideTransitionTypes.Zoom: case Asc.c_oAscSlideTransitionTypes.Zoom:
minMax=[17,17]; minMax=[17,19];
break; break;
} }
var selectedElement; var selectedElement;

8
apps/presentationeditor/main/resources/less/Transitions.less
View file

@ -4,7 +4,7 @@
} }
.item { .item {
background: transparent;
border-color: transparent; border-color: transparent;
border-width: calc(2*@scaled-one-px-value-ie) ; border-width: calc(2*@scaled-one-px-value-ie) ;
border-width: calc(@scaled-two-px-value); border-width: calc(@scaled-two-px-value);
@ -17,7 +17,13 @@
border-color: @border-preview-select-ie; border-color: @border-preview-select-ie;
border-color: @border-preview-select; border-color: @border-preview-select;
} }
//menu-picker-container
.style{
background: transparent;
}
.btn { .btn {
&:hover { &:hover {
background-color: transparent; background-color: transparent;
} }