From 08f3f53272f8eaa88488b384a1dd348732a469ca Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 2 Dec 2019 14:48:50 +0300 Subject: [PATCH] Change styles for ratio and zoom buttons --- apps/documenteditor/main/app/view/ImageSettingsAdvanced.js | 2 +- apps/documenteditor/main/resources/less/advanced-settings.less | 2 -- apps/presentationeditor/main/app/view/ChartSettings.js | 2 +- apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js | 2 +- apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js | 2 +- .../main/resources/less/advanced-settings.less | 2 -- apps/spreadsheeteditor/main/app/template/Toolbar.template | 2 +- apps/spreadsheeteditor/main/app/view/ChartSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/ImageSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js | 2 +- .../main/resources/less/advanced-settings.less | 2 -- 11 files changed, 8 insertions(+), 14 deletions(-) diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 0ff970072..fee87f477 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -185,7 +185,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.btnRatio = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'advanced-btn-ratio', + iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, hint: this.textKeepRatio diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less index bd51ba904..327aabe6c 100644 --- a/apps/documenteditor/main/resources/less/advanced-settings.less +++ b/apps/documenteditor/main/resources/less/advanced-settings.less @@ -25,8 +25,6 @@ .button-normal-icon(btn-adv-position-outer, 19, 31px); .button-otherstates-icon(btn-borders-large, 31px); -.toolbar-btn-icon(advanced-btn-ratio, 52, 20px); - .icon-advanced-wrap { .background-ximage-v2('right-panels/right_panel_wrap_btns.png', 180px, @commonimage: false); } diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index 7a21c313e..d4e3cff37 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -257,7 +257,7 @@ define([ this.btnRatio = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'advanced-btn-ratio', + iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, hint: this.textKeepRatio diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index 00fd24cfd..eda93024c 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -141,7 +141,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem this.btnRatio = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'advanced-btn-ratio', + iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, hint: this.textKeepRatio diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index 84937cb3b..0899cc590 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -144,7 +144,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.btnRatio = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'advanced-btn-ratio', + iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, hint: this.textKeepRatio diff --git a/apps/presentationeditor/main/resources/less/advanced-settings.less b/apps/presentationeditor/main/resources/less/advanced-settings.less index b10a39d39..828fd2bfe 100644 --- a/apps/presentationeditor/main/resources/less/advanced-settings.less +++ b/apps/presentationeditor/main/resources/less/advanced-settings.less @@ -1,5 +1,3 @@ -.toolbar-btn-icon(advanced-btn-ratio, 67, 20px); - .combo-arrow-style { .form-control { cursor: pointer; diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 2825f7457..89327cd50 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -152,7 +152,7 @@ - +
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 4e16b4592..caa33fc40 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -706,7 +706,7 @@ define([ this.btnRatio = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'advanced-btn-ratio', + iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, hint: this.textKeepRatio diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 44302a1e7..4dc37feff 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -142,7 +142,7 @@ define([ this.btnRatio = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'advanced-btn-ratio', + iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, hint: this.textKeepRatio diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index 1c19cf93a..0cbe4acd8 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -145,7 +145,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp this.btnRatio = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'advanced-btn-ratio', + iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, hint: this.textKeepRatio diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index bf14a990a..16ec159bc 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -1,5 +1,3 @@ -.toolbar-btn-icon(advanced-btn-ratio, 74, 20px); - .combo-arrow-style { .form-control { cursor: pointer;