diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 96fa6ddb0..a77cab621 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -62,7 +62,7 @@ define([ var template = '
' + - '
'+ + '
'+ '
' + '' + @@ -148,7 +148,7 @@ define([ } return { - // el: '#review-changes-panel', + // el: '#transitions-panel', options: {}, @@ -198,8 +198,8 @@ define([ this.listEffects = new Common.UI.ComboDataView({ cls: 'combo-styles', - itemWidth: 90, - itemHeight: 38, + itemWidth: 85, + itemHeight: 54, enableKeyEvents: true, beforeOpenHandler: function (e) { var cmp = this, @@ -244,12 +244,12 @@ define([ this.listEffects.fieldPicker.itemTemplate = _.template([ '
', - '
', + '
', '
', - '
', + '
', '', '
', - '
', + '
', '<%= title %>', '
', '
', @@ -302,15 +302,12 @@ define([ el: this.$el.findById('#transit-checkbox-slidenum'), labelText: this.strStartOnClick }); - - Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, render: function (el) { this.boxSdk = $('#editor_sdk'); if ( el ) el.html( this.getPanel() ); - return this; }, @@ -410,7 +407,6 @@ define([ minMax=[17,17]; break; } - //this.btnParametrs.menu.clearAll(); var selectedElement; _.each(this.btnParametrs.menu.items,function (element,index){ if(((indexminMax[1]))) diff --git a/apps/presentationeditor/main/resources/less/Transitions.less b/apps/presentationeditor/main/resources/less/Transitions.less new file mode 100644 index 000000000..ece20332e --- /dev/null +++ b/apps/presentationeditor/main/resources/less/Transitions.less @@ -0,0 +1,34 @@ +#transitions-panel { + input { + text-align: left; + } + + .item { + + border-color: transparent; + border-width: calc(2*@scaled-one-px-value-ie) ; + border-width: calc(@scaled-two-px-value); + &:hover{ + border-color: @border-preview-hover-ie; + border-color: @border-preview-hover; + } + &.selected + { + border-color: @border-preview-select-ie; + border-color: @border-preview-select; + } + .btn { + &:hover { + background-color: transparent; + } + .inner-box-icon + { + margin-top: -2px; + } + .inner-box-caption + { + padding-bottom: 10px; + } + } + } +} \ No newline at end of file diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 0b848f56b..2fc9cda25 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -131,6 +131,7 @@ @import "rightmenu.less"; @import "advanced-settings.less"; @import "document-preview.less"; +@import "Transitions"; @import "sprites/iconssmall@1x"; @import "sprites/iconsbig@1x";