From a7868d82eb6599e6cc27d98ba411c3825ad2bc3f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 28 Jun 2018 14:35:57 +0300 Subject: [PATCH 1/3] [Mobile] Change icons for edit settings button --- apps/documenteditor/mobile/app/template/Toolbar.template | 2 +- apps/documenteditor/mobile/resources/css/app-ios.css | 5 +++++ apps/documenteditor/mobile/resources/css/app-material.css | 5 +++++ apps/documenteditor/mobile/resources/less/ios/_icons.less | 5 +++++ .../mobile/resources/less/material/_icons.less | 5 +++++ apps/presentationeditor/mobile/app/template/Toolbar.template | 2 +- apps/presentationeditor/mobile/resources/css/app-ios.css | 5 +++++ .../presentationeditor/mobile/resources/css/app-material.css | 5 +++++ .../presentationeditor/mobile/resources/less/ios/_icons.less | 5 +++++ .../mobile/resources/less/material/_icons.less | 5 +++++ apps/spreadsheeteditor/mobile/app/template/Toolbar.template | 2 +- apps/spreadsheeteditor/mobile/resources/css/app-ios.css | 5 +++++ apps/spreadsheeteditor/mobile/resources/css/app-material.css | 5 +++++ apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less | 5 +++++ .../mobile/resources/less/material/_icons.less | 5 +++++ 15 files changed, 63 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/app/template/Toolbar.template b/apps/documenteditor/mobile/app/template/Toolbar.template index 9822b76b6..92137c8a0 100644 --- a/apps/documenteditor/mobile/app/template/Toolbar.template +++ b/apps/documenteditor/mobile/app/template/Toolbar.template @@ -29,7 +29,7 @@ <% } %> <% } %> ' + this.textNewColor + '') } - ] - }) - }); - this.btnBorderColor.render( $('#cell-border-color-btn')); - this.btnBorderColor.setColor('000000'); - this.lockedControls.push(this.btnBorderColor); + this.btnBorderColor.setMenu( new Common.UI.Menu({ + items: [ + { template: _.template('
') }, + { template: _.template('' + this.textNewColor + '') } + ] + })); this.borderColor = new Common.UI.ThemeColorPalette({ el: $('#cell-border-color-menu') }); this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this)); this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor)); - this.btnBackColor = new Common.UI.ColorButton({ - style: "width:45px;", - menu : new Common.UI.Menu({ - items: [ - { template: _.template('
') }, - { template: _.template('' + this.textNewColor + '') } - ] - }) - }); - this.btnBackColor.render( $('#cell-back-color-btn')); - this.btnBackColor.setColor('transparent'); - this.lockedControls.push(this.btnBackColor); + this.btnBackColor.setMenu( new Common.UI.Menu({ + items: [ + { template: _.template('
') }, + { template: _.template('' + this.textNewColor + '') } + ] + })); this.colorsBack = new Common.UI.ThemeColorPalette({ el: $('#cell-back-color-menu'), transparent: true diff --git a/apps/spreadsheeteditor/main/app/view/RightMenu.js b/apps/spreadsheeteditor/main/app/view/RightMenu.js index 3f851c863..2248cac0b 100644 --- a/apps/spreadsheeteditor/main/app/view/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/view/RightMenu.js @@ -161,7 +161,8 @@ define([ this.trigger('render:before', this); - el.css('width', '40px'); + var open = !Common.localStorage.getBool("sse-hide-right-settings"); + el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px'); el.css('z-index', 101); el.show(); @@ -232,6 +233,11 @@ define([ }); } + if (open) { + $('#id-cell-settings').parent().css("display", "inline-block" ); + $('#id-cell-settings').addClass("active"); + } + this.trigger('render:after', this); return this;