From ffffa133a26b810d1dc640843877cee5606b4181 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 13 Jan 2022 14:31:49 +0300 Subject: [PATCH 1/2] [PE] Fix Bug 54786 --- .../main/lib/component/ComboDataView.js | 1 + .../main/resources/less/combo-dataview.less | 19 ++++++++---- .../main/resources/less/animation.less | 30 ++++++++----------- .../main/resources/less/app.less | 1 - .../main/resources/less/transitions.less | 26 ---------------- 5 files changed, 26 insertions(+), 51 deletions(-) delete mode 100644 apps/presentationeditor/main/resources/less/transitions.less diff --git a/apps/common/main/lib/component/ComboDataView.js b/apps/common/main/lib/component/ComboDataView.js index ee482b9e7..7bd9bdc5b 100644 --- a/apps/common/main/lib/component/ComboDataView.js +++ b/apps/common/main/lib/component/ComboDataView.js @@ -255,6 +255,7 @@ define([ var picker = this.menuPicker; if (picker) { var record = picker.getSelectedRec(); + this.itemMarginLeft = undefined; this.fillComboView(record || picker.store.at(0), !!record, true); picker.onResize(); diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 079dcbe92..6e865d76a 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -378,10 +378,20 @@ height: @combo-dataview-height-calc; } - .item { + .item, .menu-picker-container .dataview .group-items-container .item { padding: 0px; - margin: @combo-dataview-item-margins 0 0 @combo-dataview-item-margins; + margin: @combo-dataview-item-margins; .box-shadow(none); + + &:hover { + .box-shadow(0 0 0 2px @border-preview-hover-ie); + .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover); + } + + &.selected { + .box-shadow(0 0 0 2px @border-preview-select-ie); + .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select); + } } .menu-picker-container { @@ -391,8 +401,6 @@ } .group-items-container .item { - box-shadow: none; - margin: @scaled-two-px-value 0 0 @scaled-two-px-value; &:last-child { margin-bottom: @combo-dataview-item-margins; } @@ -424,11 +432,10 @@ width: @x-huge-btn-icon-size; height: @x-huge-btn-icon-size; min-width: 0; - margin-top: -2px; } .caption{ - line-height: 18px; + line-height: 12px; font-size: 11px; text-overflow: ellipsis; overflow: hidden; diff --git a/apps/presentationeditor/main/resources/less/animation.less b/apps/presentationeditor/main/resources/less/animation.less index 2c4aff4ff..58d5be4ad 100644 --- a/apps/presentationeditor/main/resources/less/animation.less +++ b/apps/presentationeditor/main/resources/less/animation.less @@ -4,22 +4,6 @@ } } -.a-table{ - display: table; - width: 100%; -} -.a-tr{ - display: table-row; - height: 20px; - border-top: 2px solid transparent; - &.bottom { - border-top: 4px solid transparent; - } - .a-td - { - display: table-cell; - } -} .combo-animation { .menu-picker-container .dataview { @@ -38,15 +22,25 @@ font-weight: bold; } - .group-items-container { + .grouped-data .group-items-container { float: left; position: relative; .item { box-shadow: none; - margin: @scaled-two-px-value 0 0 @scaled-two-px-value; + margin: @scaled-two-px-value; &:last-child { margin-bottom: @scaled-two-px-value; } + + &:hover { + .box-shadow(0 0 0 2px @border-preview-hover-ie); + .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover); + } + + &.selected { + .box-shadow(0 0 0 2px @border-preview-select-ie); + .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select); + } } } } \ 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 8d5db8d30..b681f127c 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -132,7 +132,6 @@ @import "rightmenu.less"; @import "advanced-settings.less"; @import "document-preview.less"; -@import "transitions.less"; @import "animation.less"; @import "sprites/iconssmall@1x"; diff --git a/apps/presentationeditor/main/resources/less/transitions.less b/apps/presentationeditor/main/resources/less/transitions.less deleted file mode 100644 index 1623fd2ef..000000000 --- a/apps/presentationeditor/main/resources/less/transitions.less +++ /dev/null @@ -1,26 +0,0 @@ -.combo-transitions { - .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: normal; - font-size: 11px; - text-overflow: ellipsis; - overflow: hidden; - width: 100%; - text-align: center; - padding: 0 2px; - } - } -} \ No newline at end of file From 15ab72745be4c2e0483fa149c55f90b24fd918d2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 13 Jan 2022 14:38:22 +0300 Subject: [PATCH 2/2] [PE] Fix Bug 54786 --- apps/presentationeditor/main/app/view/Animation.js | 4 ++-- apps/presentationeditor/main/app/view/Transitions.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js index 6a9e273a3..cb1d31d83 100644 --- a/apps/presentationeditor/main/app/view/Animation.js +++ b/apps/presentationeditor/main/app/view/Animation.js @@ -161,7 +161,7 @@ define([ this._arrEffectName = [{group:'none', value: AscFormat.ANIM_PRESET_NONE, iconCls: 'animation-none', displayValue: this.textNone}].concat(Common.define.effectData.getEffectData()); _.forEach(this._arrEffectName,function (elm){elm.tip = elm.displayValue;}); this._arrEffectOptions = []; - var itemWidth = 87, + var itemWidth = 88, itemHeight = 40; this.listEffectsMore = new Common.UI.MenuItem({ caption: this.textMoreEffects @@ -415,7 +415,7 @@ define([ ] })); - var itemWidth = 87, + var itemWidth = 88, itemHeight = 40; var onShowBefore = function(menu) { var picker = new Common.UI.DataView({ diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 400693162..338bdb1c6 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -136,7 +136,7 @@ define([ item.tip = item.title; }); - var itemWidth = 87, + var itemWidth = 88, itemHeight = 40; this.listEffects = new Common.UI.ComboDataView({ cls: 'combo-transitions',