From 929ba40dbd57c97bbb544e06a2eb75bc6c768dfb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 2 Dec 2019 11:40:47 +0300 Subject: [PATCH] [SSE] Fix icons for advanced settings --- .../main/app/view/FileMenuPanels.js | 6 ++--- .../main/resources/less/leftmenu.less | 27 ++----------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index c3fa2c2e8..07218e341 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -199,9 +199,9 @@ define([ this.viewSettingsPicker = new Common.UI.DataView({ el: $markup.findById('#id-settings-menu'), store: new Common.UI.DataViewStore([ - {name: this.txtGeneral, panel: this.generalSettings, iconCls:'mnu-settings-general', selected: true}, - {name: this.txtPageSettings, panel: this.printSettings, iconCls:'mnu-print'}, - {name: this.txtSpellChecking, panel: this.spellcheckSettings, iconCls:'mu-settings-spellcheck'} + {name: this.txtGeneral, panel: this.generalSettings, iconCls:'toolbar__icon btn-settings', selected: true}, + {name: this.txtPageSettings, panel: this.printSettings, iconCls:'toolbar__icon btn-print'}, + {name: this.txtSpellChecking, panel: this.spellcheckSettings, iconCls:'toolbar__icon btn-ic-docspell'} ]), itemTemplate: _.template([ '
', diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index d274207fe..ee420a7a1 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -189,22 +189,8 @@ .settings-icon { width: 20px; height: 20px; - background-repeat: no-repeat; - .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px); margin: 0 5px 3px 0; vertical-align: middle; - - &.mnu-print { - background-position: 0 -220px; - } - - &.mnu-settings-general { - background-position: 0 -1141px; - } - - &.mu-settings-spellcheck { - background-position: 0px -1860px; - } } } @@ -218,17 +204,8 @@ color: @dropdown-link-active-color; .settings-icon { - &.mnu-print { - background-position: -20px -220px; - } - - &.mnu-settings-general { - background-position: -20px -1141px; - } - - &.mu-settings-spellcheck { - background-position: -20px -1860px; - } + background-position-x: -20px; + --bgX: -20px; } } }