diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 3dd2185510..223e3f0887 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -275,7 +275,7 @@ define([ dataHint : '', dataHintDirection: '', dataHintOffset: '0, 0', - scaling : false, + scaling : true, }, template: _.template([ @@ -344,9 +344,6 @@ define([ me.render(); } else if (me.options.parentEl) me.render(me.options.parentEl); - - // TODO: for review scaling feature only. remove after - me.options.scaling = true; }, getCaptionWithBreaks: function (caption) { diff --git a/apps/common/main/resources/less/bigscaling.less b/apps/common/main/resources/less/bigscaling.less index ed1a68e837..edaff40085 100644 --- a/apps/common/main/resources/less/bigscaling.less +++ b/apps/common/main/resources/less/bigscaling.less @@ -16,4 +16,28 @@ svg.icon:not(.uni-scale):not(.pixel-ratio__2_5 *) { display: none; } +} + +.btn-category { + &:active, + &.active { + &:not(.disabled) { + svg.icon { + fill: @icon-normal-pressed-ie; + fill: @icon-normal-pressed; + //.btn& { + // opacity: 1; + //} + } + } + } + + svg.icon { + fill: @icon-normal-ie; + fill: @icon-normal; + + .btn& { + //opacity: 1; + } + } } \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js index 007a072655..bcc14eec36 100644 --- a/apps/documenteditor/main/app/view/LeftMenu.js +++ b/apps/documenteditor/main/app/view/LeftMenu.js @@ -90,6 +90,7 @@ define([ el: $markup.elementById('#left-btn-searchbar'), hint: this.tipSearch, disabled: true, + iconCls: 'btn-menu-search', enableToggle: true, toggleGroup: 'leftMenuGroup' }); @@ -101,6 +102,7 @@ define([ hint: this.tipAbout, enableToggle: true, disabled: true, + iconCls: 'btn-menu-about', toggleGroup: 'leftMenuGroup' }); this.btnAbout.on('toggle', this.onBtnMenuToggle.bind(this)); @@ -109,6 +111,7 @@ define([ action: 'support', el: $markup.elementById('#left-btn-support'), hint: this.tipSupport, + iconCls: 'btn-menu-support', disabled: true }); @@ -118,6 +121,7 @@ define([ hint: this.tipComments + Common.Utils.String.platformKey('Ctrl+Shift+H'), enableToggle: true, disabled: true, + iconCls: 'btn-menu-comments', toggleGroup: 'leftMenuGroup' }); this.btnComments.on('click', this.onBtnMenuClick.bind(this)); @@ -128,6 +132,7 @@ define([ hint: this.tipChat + Common.Utils.String.platformKey('Alt+Q', ' (' + (Common.Utils.isMac ? Common.Utils.String.textCtrl + '+' : '') + '{0})'), enableToggle: true, disabled: true, + iconCls: 'btn-menu-chat', toggleGroup: 'leftMenuGroup' }); this.btnChat.on('click', this.onBtnMenuClick.bind(this)); @@ -142,6 +147,7 @@ define([ hint: this.tipPlugins, enableToggle: true, disabled: true, + iconCls: 'btn-menu-plugin', toggleGroup: 'leftMenuGroup' }); this.btnPlugins.hide(); @@ -152,6 +158,7 @@ define([ hint: this.tipOutline, enableToggle: true, disabled: true, + iconCls: 'btn-menu-navigation', toggleGroup: 'leftMenuGroup' }); this.btnNavigation.on('click', this.onBtnMenuClick.bind(this)); @@ -164,6 +171,7 @@ define([ hint: this.tipPageThumbnails, enableToggle: true, disabled: true, + iconCls: 'btn-menu-thumbs', toggleGroup: 'leftMenuGroup' }); this.btnThumbnails.hide();