diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 9dee857ab..55f461d75 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -171,8 +171,8 @@ define([ this.listEffects.fieldPicker.itemTemplate = _.template([ '
', - '
', - '
', + '
', + '
', '
<%= title %>
', '
', '
' diff --git a/apps/presentationeditor/main/resources/less/transitions.less b/apps/presentationeditor/main/resources/less/transitions.less index 356cd658e..4fcf450f5 100644 --- a/apps/presentationeditor/main/resources/less/transitions.less +++ b/apps/presentationeditor/main/resources/less/transitions.less @@ -2,37 +2,27 @@ .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) ; 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; } - .style{ background: transparent; } - - .btn { - border: none; - &:hover { - background: transparent; - } - .icon - { - margin-top: -2px; - } - - } } .combo-dataview @@ -42,14 +32,6 @@ &:hover:not(.selected) { border-color: transparent; } - .btn{ - background: transparent; - cursor: default; - &:active, - &.active { - .icon {opacity: @component-normal-icon-opacity;} - } - } } } } @@ -59,4 +41,23 @@ margin-left: 10px; } +} +.btn_item { + color: @text-normal-ie; + color: @text-normal; + display: inline-flex; + flex-direction: column; + align-items: center; + + .icon:not(svg) { + width: @x-huge-btn-icon-size; + height: @x-huge-btn-icon-size; + min-width: 0; + margin-top: -2px; + } + + .caption{ + line-height: 18px; + font-size: 11px; + } } \ No newline at end of file