Edit templates
This commit is contained in:
parent
5742271ba5
commit
ed42b9979e
|
@ -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');
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<%= tabsmarkup %>
|
||||
<div class="extra right"></div>
|
||||
</section>
|
||||
<section class="box-controls">%
|
||||
<section class="box-controls">
|
||||
<section class="panel static">
|
||||
<div class="group no-mask small">
|
||||
<div class="elset">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<section id="transitions-panel" class="panel" data-tab="transit">
|
||||
<div class="group flex small" id="transit-field-effects" style=" width: 56%; min-width: 300px; " ></div>
|
||||
<div class="group flex small" id="transit-field-effects" style=" width: 700px; min-width: 300px;"></div>
|
||||
|
||||
<div class="group small">
|
||||
<span class="btn-slot text x-huge" id="transit-button-parametrs"></span>
|
||||
|
@ -7,30 +7,30 @@
|
|||
<div class="separator long"></div>
|
||||
<div class="group small">
|
||||
<div class="elset font-normal">
|
||||
<div class="btn-slot text" id="label-duration" style="font-size: 11px; text-align: left; "><%=Duration%></div>
|
||||
<span id="transit-spin-duration" class="btn-slot text spinner" "></span>
|
||||
<label><%=Duration%></label>
|
||||
<span id="transit-spin-duration" class="btn-slot text spinner"></span>
|
||||
</div>
|
||||
<div class="elset">
|
||||
<span class="btn-slot text" id="transit-button-preview" ></span>
|
||||
<span class="btn-slot text" id="transit-button-preview"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="separator long"></div>
|
||||
<div class="group small" >
|
||||
<div class="group small">
|
||||
<div class="elset">
|
||||
<span class="btn-slot text" id="transit-checkbox-startonclick"></span>
|
||||
</div>
|
||||
<div class="elset font-normal">
|
||||
<span class="btn-slot text" id="transit-checkbox-delay" ></span>
|
||||
<span class="btn-slot text" id="transit-checkbox-delay"></span>
|
||||
<div id="transit-spin-delay" class="btn-slot text spinner"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="separator long"></div>
|
||||
<div class="group small">
|
||||
<div class="elset">
|
||||
<span class="btn-slot text " id="transit-button-apply" "></span>
|
||||
<span class="btn-slot text " id="transit-button-apply"></span>
|
||||
</div>
|
||||
<div class="elset">
|
||||
<span class="btn-slot text x-huge" ></span>
|
||||
<span class="btn-slot text x-huge"></span>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
|
@ -195,15 +195,9 @@ define([
|
|||
|
||||
this.listEffects.fieldPicker.itemTemplate = _.template([
|
||||
'<div class="style" id="<%= id %>">',
|
||||
'<div style="width: ' + this.listEffects.itemWidth + 'px; height: '+(this.listEffects.itemHeight-16)+'px; ">',
|
||||
'<div class="btn btn-toolbar x-huge icon-top"data-toggle="tooltip" data-original-title="" title="">',
|
||||
'<div class="inner-box-icon" style="width: ' + (this.listEffects.itemWidth) +'px;">',
|
||||
'<i class="icon toolbar__icon <%= imageUrl %>"></i>',
|
||||
'</div>',
|
||||
'<div class="inner-box-caption" style=" ">',
|
||||
'<span class="caption" style="font-size: 11px;"><%= title %></span>',
|
||||
'</div>',
|
||||
'</div>',
|
||||
'<div class="btn btn-toolbar x-huge icon-top" style="width: ' + (this.listEffects.itemWidth) +'px;height: '+(this.listEffects.itemHeight)+'px;">',
|
||||
'<div class=" icon toolbar__icon <%= imageUrl %>"></div>',
|
||||
'<div class="caption"><%= title %></div>',
|
||||
'</div>',
|
||||
'</div>'
|
||||
].join(''));
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue