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

[PE] Fix merge release to develop

Browse source
This commit is contained in:
Julia Radzhabova 2022-03-10 14:55:03 +03:00
parent 0137bb22a4
commit fd72c1d2eb
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -179,7 +179,7 @@
</div>
</section>
<section id="animation-panel" class="panel" data-tab="animate">
<div class="group flex small" id="animation-field-effects" style="width: 700px; max-width: 700px; min-width: 140px;" data-group-width="700px"></div>
<div class="group flex small" id="animation-field-effects" style="width: 700px; max-width: 700px; min-width: 220px;" data-group-width="700px"></div>
<div class="group small">
<span class="btn-slot text x-huge" id="animation-button-parameters"></span>
</div>
@ -189,7 +189,7 @@
</div>
<div class="separator long"></div>
<div class="group small">
<span class="btn-slot text" id="animation-button-preview"></span>
<span class="btn-slot text" id="animation-button-preview"></span>
<!--<div class="elset">
<span class="btn-slot text " id="animation-button-pane"></span>
</div>-->
@ -197,6 +197,9 @@
<div class="separator long"></div>
<div class="group small">
<div class="elset font-normal">
<span class="btn-slot text" id="animation-label-start"></span>
<div class="btn-slot" style="width: 96px; " id="animation-start"></div>
</div>
<div class="elset font-normal">
<div class="btn-slot text" id="animation-trigger"></div>
</div>
@ -217,7 +220,7 @@
<div id="animation-spin-repeat" style="width: 96px; " class="btn-slot" ></div>
</div>
<div class="elset font-normal">
<span class="btn-slot text" id="animation-checkbox-rewind"></span>
<span class="btn-slot text" id="animation-checkbox-rewind"></span>
</div>
</div>
<div class="separator long"></div>

2
apps/presentationeditor/main/app/view/Animation.js
View file

@ -196,7 +196,7 @@ define([
cls: 'combo-transitions combo-animation',
itemWidth: itemWidth,
itemHeight: itemHeight,
style: 'min-width:200px;',
style: 'min-width:210px;',
itemTemplate: _.template([
'<div class = "btn_item x-huge" id = "<%= id %>" style = "width: ' + itemWidth + 'px;height: ' + itemHeight + 'px;">',
'<div class = "icon toolbar__icon <%= iconCls %>"></div>',