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

Merge pull request #1467 from ONLYOFFICE/fix/bug-54786

Browse source 
Fix/bug 54786
This commit is contained in:
Julia Radzhabova 2022-01-13 14:48:39 +03:00 committed by GitHub
parent b4d1d247ed 15ab72745b
commit a909192ff7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/lib/component/ComboDataView.js
View file

@ -255,6 +255,7 @@ define([
var picker = this.menuPicker; var picker = this.menuPicker;
if (picker) { if (picker) {
var record = picker.getSelectedRec(); var record = picker.getSelectedRec();
this.itemMarginLeft = undefined;
this.fillComboView(record || picker.store.at(0), !!record, true); this.fillComboView(record || picker.store.at(0), !!record, true);
picker.onResize(); picker.onResize();

19
apps/common/main/resources/less/combo-dataview.less
View file

@ -378,10 +378,20 @@
height: @combo-dataview-height-calc; height: @combo-dataview-height-calc;
} }
.item { .item, .menu-picker-container .dataview .group-items-container .item {
padding: 0px; padding: 0px;
margin: @combo-dataview-item-margins 0 0 @combo-dataview-item-margins; margin: @combo-dataview-item-margins;
.box-shadow(none); .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 { .menu-picker-container {
@ -391,8 +401,6 @@
} }
.group-items-container .item { .group-items-container .item {
box-shadow: none;
margin: @scaled-two-px-value 0 0 @scaled-two-px-value;
&:last-child { &:last-child {
margin-bottom: @combo-dataview-item-margins; margin-bottom: @combo-dataview-item-margins;
} }
@ -424,11 +432,10 @@
width: @x-huge-btn-icon-size; width: @x-huge-btn-icon-size;
height: @x-huge-btn-icon-size; height: @x-huge-btn-icon-size;
min-width: 0; min-width: 0;
margin-top: -2px;
} }
.caption{ .caption{
line-height: 18px; line-height: 12px;
font-size: 11px; font-size: 11px;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;

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

@ -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()); 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;}); _.forEach(this._arrEffectName,function (elm){elm.tip = elm.displayValue;});
this._arrEffectOptions = []; this._arrEffectOptions = [];
var itemWidth = 87, var itemWidth = 88,
itemHeight = 40; itemHeight = 40;
this.listEffectsMore = new Common.UI.MenuItem({ this.listEffectsMore = new Common.UI.MenuItem({
caption: this.textMoreEffects caption: this.textMoreEffects
@ -415,7 +415,7 @@ define([
] ]
})); }));
var itemWidth = 87, var itemWidth = 88,
itemHeight = 40; itemHeight = 40;
var onShowBefore = function(menu) { var onShowBefore = function(menu) {
var picker = new Common.UI.DataView({ var picker = new Common.UI.DataView({

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

@ -136,7 +136,7 @@ define([
item.tip = item.title; item.tip = item.title;
}); });
var itemWidth = 87, var itemWidth = 88,
itemHeight = 40; itemHeight = 40;
this.listEffects = new Common.UI.ComboDataView({ this.listEffects = new Common.UI.ComboDataView({
cls: 'combo-transitions', cls: 'combo-transitions',

30
apps/presentationeditor/main/resources/less/animation.less
View file

@ -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 { .combo-animation {
.menu-picker-container .dataview { .menu-picker-container .dataview {
@ -38,15 +22,25 @@
font-weight: bold; font-weight: bold;
} }
.group-items-container { .grouped-data .group-items-container {
float: left; float: left;
position: relative; position: relative;
.item { .item {
box-shadow: none; box-shadow: none;
margin: @scaled-two-px-value 0 0 @scaled-two-px-value; margin: @scaled-two-px-value;
&:last-child { &:last-child {
margin-bottom: @scaled-two-px-value; 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);
}
} }
} }
} }

1
apps/presentationeditor/main/resources/less/app.less
View file

@ -132,7 +132,6 @@
@import "rightmenu.less"; @import "rightmenu.less";
@import "advanced-settings.less"; @import "advanced-settings.less";
@import "document-preview.less"; @import "document-preview.less";
@import "transitions.less";
@import "animation.less"; @import "animation.less";
@import "sprites/iconssmall@1x"; @import "sprites/iconssmall@1x";

26
apps/presentationeditor/main/resources/less/transitions.less
View file

@ -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;
}
}
}