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

Bug 43909

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-17 15:15:19 +03:00
parent d207cab626
commit 5cb3cc0e84
4 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/main/resources/less/buttons.less
View file

@ -28,6 +28,10 @@
.btnsize(37px); .btnsize(37px);
} }
&.huge-1 {
.btnsize(45px);
}
&.x-huge { &.x-huge {
.btnsize(@x-huge-btn-height); .btnsize(@x-huge-btn-height);
} }
@ -580,6 +584,10 @@
.box-shadow(none); .box-shadow(none);
background-color: transparent; background-color: transparent;
&.bg-white {
background-color: #fff;
}
.icon { .icon {
position: relative; position: relative;
min-width: inherit; min-width: inherit;

6
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file

@ -301,7 +301,7 @@ define([
}, me)); }, me));
this.btnNone = new Common.UI.Button({ this.btnNone = new Common.UI.Button({
cls : 'btn x-huge btn-options', cls : 'btn huge-1 btn-options',
iconCls : 'icon-advanced-wrap btn-drop-none', iconCls : 'icon-advanced-wrap btn-drop-none',
enableToggle: true, enableToggle: true,
toggleGroup : 'dropAdvGroup', toggleGroup : 'dropAdvGroup',
@ -316,7 +316,7 @@ define([
}, me)); }, me));
this.btnInText = new Common.UI.Button({ this.btnInText = new Common.UI.Button({
cls : 'btn x-huge btn-options', cls : 'btn huge-1 btn-options',
iconCls : 'icon-advanced-wrap btn-drop-text', iconCls : 'icon-advanced-wrap btn-drop-text',
enableToggle: true, enableToggle: true,
toggleGroup : 'dropAdvGroup', toggleGroup : 'dropAdvGroup',
@ -331,7 +331,7 @@ define([
}, me)); }, me));
this.btnInMargin = new Common.UI.Button({ this.btnInMargin = new Common.UI.Button({
cls : 'btn x-huge btn-options', cls : 'btn huge-1 btn-options',
iconCls : 'icon-advanced-wrap btn-drop-margin', iconCls : 'icon-advanced-wrap btn-drop-margin',
enableToggle: true, enableToggle: true,
toggleGroup : 'dropAdvGroup', toggleGroup : 'dropAdvGroup',

2
apps/documenteditor/main/app/view/HeaderFooterSettings.js
View file

@ -231,7 +231,7 @@ define([
this._btnsPosition = []; this._btnsPosition = [];
_.each(_arrPosition, function(item, index, list){ _.each(_arrPosition, function(item, index, list){
var _btn = new Common.UI.Button({ var _btn = new Common.UI.Button({
cls: 'btn-options huge', cls: 'btn-options huge bg-white',
iconCls: item[2], iconCls: item[2],
posWhere:item[0], posWhere:item[0],
posAlign:item[1], posAlign:item[1],

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

@ -398,7 +398,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
// Wrapping // Wrapping
this.btnWrapInline = new Common.UI.Button({ this.btnWrapInline = new Common.UI.Button({
cls: 'btn-options x-huge', cls: 'btn-options huge-1',
iconCls: 'icon-advanced-wrap btn-wrap-inline', iconCls: 'icon-advanced-wrap btn-wrap-inline',
posId: Asc.c_oAscWrapStyle2.Inline, posId: Asc.c_oAscWrapStyle2.Inline,
hint: this.textWrapInlineTooltip, hint: this.textWrapInlineTooltip,
@ -410,7 +410,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnWrapInline.on('click', _.bind(this.onBtnWrapClick, this)); this.btnWrapInline.on('click', _.bind(this.onBtnWrapClick, this));
this.btnWrapSquare = new Common.UI.Button({ this.btnWrapSquare = new Common.UI.Button({
cls: 'btn-options x-huge', cls: 'btn-options huge-1',
iconCls: 'icon-advanced-wrap btn-wrap-square', iconCls: 'icon-advanced-wrap btn-wrap-square',
posId: Asc.c_oAscWrapStyle2.Square, posId: Asc.c_oAscWrapStyle2.Square,
hint: this.textWrapSquareTooltip, hint: this.textWrapSquareTooltip,
@ -422,7 +422,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnWrapSquare.on('click', _.bind(this.onBtnWrapClick, this)); this.btnWrapSquare.on('click', _.bind(this.onBtnWrapClick, this));
this.btnWrapTight = new Common.UI.Button({ this.btnWrapTight = new Common.UI.Button({
cls: 'btn-options x-huge', cls: 'btn-options huge-1',
iconCls: 'icon-advanced-wrap btn-wrap-tight', iconCls: 'icon-advanced-wrap btn-wrap-tight',
posId: Asc.c_oAscWrapStyle2.Tight, posId: Asc.c_oAscWrapStyle2.Tight,
hint: this.textWrapTightTooltip, hint: this.textWrapTightTooltip,
@ -434,7 +434,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnWrapTight.on('click', _.bind(this.onBtnWrapClick, this)); this.btnWrapTight.on('click', _.bind(this.onBtnWrapClick, this));
this.btnWrapThrough = new Common.UI.Button({ this.btnWrapThrough = new Common.UI.Button({
cls: 'btn-options x-huge', cls: 'btn-options huge-1',
iconCls: 'icon-advanced-wrap btn-wrap-through', iconCls: 'icon-advanced-wrap btn-wrap-through',
posId: Asc.c_oAscWrapStyle2.Through, posId: Asc.c_oAscWrapStyle2.Through,
hint: this.textWrapThroughTooltip, hint: this.textWrapThroughTooltip,
@ -446,7 +446,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnWrapThrough.on('click', _.bind(this.onBtnWrapClick, this)); this.btnWrapThrough.on('click', _.bind(this.onBtnWrapClick, this));
this.btnWrapTopBottom = new Common.UI.Button({ this.btnWrapTopBottom = new Common.UI.Button({
cls: 'btn-options x-huge', cls: 'btn-options huge-1',
iconCls: 'icon-advanced-wrap btn-wrap-topbottom', iconCls: 'icon-advanced-wrap btn-wrap-topbottom',
posId: Asc.c_oAscWrapStyle2.TopAndBottom, posId: Asc.c_oAscWrapStyle2.TopAndBottom,
hint: this.textWrapTopbottomTooltip, hint: this.textWrapTopbottomTooltip,
@ -458,7 +458,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnWrapTopBottom.on('click', _.bind(this.onBtnWrapClick, this)); this.btnWrapTopBottom.on('click', _.bind(this.onBtnWrapClick, this));
this.btnWrapBehind = new Common.UI.Button({ this.btnWrapBehind = new Common.UI.Button({
cls: 'btn-options x-huge', cls: 'btn-options huge-1',
iconCls: 'icon-advanced-wrap btn-wrap-behind', iconCls: 'icon-advanced-wrap btn-wrap-behind',
posId: Asc.c_oAscWrapStyle2.Behind, posId: Asc.c_oAscWrapStyle2.Behind,
hint: this.textWrapBehindTooltip, hint: this.textWrapBehindTooltip,
@ -470,7 +470,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnWrapBehind.on('click', _.bind(this.onBtnWrapClick, this)); this.btnWrapBehind.on('click', _.bind(this.onBtnWrapClick, this));
this.btnWrapInFront = new Common.UI.Button({ this.btnWrapInFront = new Common.UI.Button({
cls: 'btn-options x-huge', cls: 'btn-options huge-1',
iconCls: 'icon-advanced-wrap btn-wrap-infront', iconCls: 'icon-advanced-wrap btn-wrap-infront',
posId: Asc.c_oAscWrapStyle2.InFront, posId: Asc.c_oAscWrapStyle2.InFront,
hint: this.textWrapInFrontTooltip, hint: this.textWrapInFrontTooltip,