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

Fix Bug 58276

Browse source
This commit is contained in:
Julia Radzhabova 2022-07-25 23:17:10 +03:00
parent 5ff1d0f48b
commit e3499ad0b4
7 changed files with 65 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/common/main/resources/less/advanced-settings-window.less
View file

@ -52,4 +52,29 @@
padding-right: 30px; padding-right: 30px;
} }
} }
} }
.combo-arrow-style {
.form-control {
cursor: pointer;
.image {
width: 100%;
height: 100%;
display: inline-block;
background-color: transparent;
margin: 0 0 0 -3px;
}
}
}
.img-arrows {
.background-ximage-v2('right-panels/Begin-EndStyle.png', 480px);
-webkit-filter: @img-border-type-filter;
filter: @img-border-type-filter;
}
.item-arrow {
width:44px;
height:20px;
}

18
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -1015,7 +1015,9 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-begin-style'), el: $('#shape-advanced-begin-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">', '<button type="button" class="btn btn-default">',
'<span class="caret"></span>', '<span class="caret"></span>',
@ -1044,7 +1046,9 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-begin-size'), el: $('#shape-advanced-begin-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">', '<button type="button" class="btn btn-default">',
'<span class="caret"></span>', '<span class="caret"></span>',
@ -1079,7 +1083,9 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-end-style'), el: $('#shape-advanced-end-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">', '<button type="button" class="btn btn-default">',
'<span class="caret"></span>', '<span class="caret"></span>',
@ -1108,7 +1114,9 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-end-size'), el: $('#shape-advanced-end-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">', '<button type="button" class="btn btn-default">',
'<span class="caret"></span>', '<span class="caret"></span>',
@ -2083,7 +2091,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
}, },
_selectStyleItem: function(combo, record) { _selectStyleItem: function(combo, record) {
var formcontrol = $(combo.el).find('.form-control'); var formcontrol = $(combo.el).find('.form-control > .image');
formcontrol.css('background-position', ((record) ? (-record.get('offsetx')+20) + 'px' : '0') + ' ' + ((record) ? '-' + record.get('offsety') + 'px' : '-30px')); formcontrol.css('background-position', ((record) ? (-record.get('offsetx')+20) + 'px' : '0') + ' ' + ((record) ? '-' + record.get('offsety') + 'px' : '-30px'));
}, },

22
apps/documenteditor/main/resources/less/advanced-settings.less
View file

@ -4,28 +4,6 @@
.icon-advanced-wrap { .icon-advanced-wrap {
} }
.combo-arrow-style {
.form-control {
cursor: pointer;
background-color: white;
&.image {
background-position: 10px 0;
background-attachment: scroll;
background-color: @background-normal;
}
}
}
.img-arrows {
.background-ximage-v2('right-panels/Begin-EndStyle.png', 480px, @commonimage: true);
}
.item-arrow {
width:44px;
height:20px;
}
.header-styles-tableview { .header-styles-tableview {
.list-item > div{ .list-item > div{
&:nth-child(1) { &:nth-child(1) {

18
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -406,7 +406,9 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-begin-style'), el: $('#shape-advanced-begin-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -433,7 +435,9 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-begin-size'), el: $('#shape-advanced-begin-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -466,7 +470,9 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-end-style'), el: $('#shape-advanced-end-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -493,7 +499,9 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-end-size'), el: $('#shape-advanced-end-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -853,7 +861,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
}, },
_selectStyleItem: function(combo, record) { _selectStyleItem: function(combo, record) {
var formcontrol = $(combo.el).find('.form-control'); var formcontrol = $(combo.el).find('.form-control > .image');
formcontrol.css('background-position', ((record) ? (-record.get('offsetx')+20) + 'px' : '0') + ' ' + ((record) ? '-' + record.get('offsety') + 'px' : '-30px')); formcontrol.css('background-position', ((record) ? (-record.get('offsetx')+20) + 'px' : '0') + ' ' + ((record) ? '-' + record.get('offsety') + 'px' : '-30px'));
}, },

31
apps/presentationeditor/main/resources/less/advanced-settings.less
View file

@ -1,34 +1,3 @@
.combo-arrow-style {
.form-control {
cursor: pointer;
background-color: white;
&.image {
background-position: 10px 0;
background-attachment: scroll;
background-color: @background-normal;
}
}
.btn {
&:active:not(.disabled),
&.active:not(.disabled){
.caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
}
}
}
}
.img-arrows {
.background-ximage-v2('right-panels/Begin-EndStyle.png', 480px, @commonimage: true);
}
.item-arrow {
width:44px;
height:20px;
}
.advanced-settings-dlg { .advanced-settings-dlg {
.div-category { .div-category {
padding: 0 15px; padding: 0 15px;

18
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -376,7 +376,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-begin-style'), el: $('#shape-advanced-begin-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -403,7 +405,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-begin-size'), el: $('#shape-advanced-begin-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -436,7 +440,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-end-style'), el: $('#shape-advanced-end-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -463,7 +469,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-end-size'), el: $('#shape-advanced-end-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>', '<div class="form-control" style="width: 100px;">',
'<i class="image img-arrows"></i>',
'</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -835,7 +843,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
}, },
_selectStyleItem: function(combo, record) { _selectStyleItem: function(combo, record) {
var formcontrol = $(combo.el).find('.form-control'); var formcontrol = $(combo.el).find('.form-control > .image');
formcontrol.css('background-position', ((record) ? (-record.get('offsetx')+20) + 'px' : '0') + ' ' + ((record) ? '-' + record.get('offsety') + 'px' : '-30px')); formcontrol.css('background-position', ((record) ? (-record.get('offsetx')+20) + 'px' : '0') + ' ' + ((record) ? '-' + record.get('offsety') + 'px' : '-30px'));
}, },

31
apps/spreadsheeteditor/main/resources/less/advanced-settings.less
View file

@ -1,34 +1,3 @@
.combo-arrow-style {
.form-control {
cursor: pointer;
background-color: white;
&.image {
background-position: 10px 0;
background-attachment: scroll;
background-color: @background-normal;
}
}
.btn {
&:active:not(.disabled),
&.active:not(.disabled){
.caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
}
}
}
}
.img-arrows {
.background-ximage-v2('right-panels/Begin-EndStyle.png', 480px, @commonimage: true);
}
.item-arrow {
width:44px;
height:20px;
}
.advanced-settings-dlg { .advanced-settings-dlg {
.div-category { .div-category {
padding: 0 0 0 10px; padding: 0 0 0 10px;