From 3784eb071711af4b3710e582a958e67308e537c7 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 4 Apr 2017 17:47:21 +0300 Subject: [PATCH] [DE] national's flags were moved to separate sprite --- apps/common/main/lib/view/Header.js | 2 +- apps/common/main/lib/view/ReviewChanges.js | 8 +- .../main/resources/img/controls/flags.png | Bin 0 -> 4415 bytes .../main/resources/img/controls/flags@2x.png | Bin 0 -> 10420 bytes .../main/resources/less/asc-mixins.less | 15 +++ .../main/resources/less/review-changes.less | 12 -- .../main/app/template/StatusBar.template | 2 +- .../documenteditor/main/app/view/Statusbar.js | 14 +-- apps/documenteditor/main/app/view/Toolbar.js | 10 +- .../main/resources/img/toolbar-menu.png | Bin 26636 -> 16375 bytes .../main/resources/img/toolbar-menu@2x.png | Bin 62754 -> 40747 bytes .../main/resources/less/leftmenu.less | 2 +- .../main/resources/less/statusbar.less | 104 ++++++++---------- .../main/resources/less/toolbar.less | 16 ++- 14 files changed, 94 insertions(+), 91 deletions(-) create mode 100644 apps/common/main/resources/img/controls/flags.png create mode 100644 apps/common/main/resources/img/controls/flags@2x.png diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 9da22c66f..d20b0f1fb 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -281,7 +281,7 @@ define([ me.btnGoBack = new Common.UI.Button({ id: 'btn-goback', cls: 'btn-toolbar', - iconCls: 'img-commonctrl review-prev', + iconCls: 'btn-goback', split: true, menu: new Common.UI.Menu({ style: 'min-width: 60px;', diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index c2ae3fe1d..f6e66808d 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -481,13 +481,13 @@ define([ this.btnPrev = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'img-commonctrl review-prev', + iconCls: 'review-prev', caption: this.txtPrev }); this.btnNext = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'img-commonctrl review-next', + iconCls: 'review-next', caption: this.txtNext }); @@ -495,14 +495,14 @@ define([ cls: 'btn-toolbar x-huge icon-top', caption: this.txtAccept, split: true, - iconCls: 'img-commonctrl review-close' + iconCls: 'review-save' }); this.btnReject = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', caption: this.txtReject, split: true, - iconCls: 'img-commonctrl review-close' + iconCls: 'review-deny' }); this.btnTurnOn = new Common.UI.Button({ diff --git a/apps/common/main/resources/img/controls/flags.png b/apps/common/main/resources/img/controls/flags.png new file mode 100644 index 0000000000000000000000000000000000000000..017b02b4288917bfc45018d29b0cf0d221cf8e12 GIT binary patch literal 4415 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 .review-prev, -button:active > .review-prev {background-position: -60px -250px !important;} - -.review-next {background-position: -40px -270px;} -button.active > .review-next, -button:active > .review-next {background-position: -60px -270px !important;} - -.review-close {background-position: -40px -290px;} -button.active > .review-close, -button:active > .review-close {background-position: -60px -290px !important;} diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template index 78b8456fc..baa6ef455 100644 --- a/apps/documenteditor/main/app/template/StatusBar.template +++ b/apps/documenteditor/main/app/template/StatusBar.template @@ -14,7 +14,7 @@
- +
diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 3e30d9bbc..b455d7c4c 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -70,7 +70,7 @@ define([ var $parent = menu.$el.parent(); $parent.find('#status-label-lang').text(item.caption); - $parent.find('.icon-lang-flag') + $parent.find('.dropdown-toggle > .icon.lang-flag') .removeClass(this.langMenu.prevTip) .addClass(item.value.tip); @@ -251,8 +251,8 @@ define([ maxHeight: 300, itemTemplate: _.template([ '', - '', - '<%= caption %>', + '', + '<%= caption %>', '' ].join('')), menuAlign: 'bl-tl' @@ -377,7 +377,7 @@ define([ setLanguage: function(info) { if (this.langMenu.prevTip != info.tip) { var $parent = $(this.langMenu.el.parentNode, this.$el); - $parent.find('.icon-lang-flag') + $parent.find('.dropdown-toggle > .icon.lang-flag') .removeClass(this.langMenu.prevTip) .addClass(info.tip); @@ -463,13 +463,13 @@ define([ template: _.template([ '', '', - '', + '', '', '