From 27fd54d45e2cf31d43394317139f32bb39cbdff9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 11 Jul 2017 11:27:56 +0300 Subject: [PATCH] [DE] updated toolbar layout --- .../resources/img/controls/toolbarbig.png | Bin 6777 -> 8131 bytes apps/common/main/resources/less/toolbar.less | 11 ++++ .../main/app/template/Toolbar.template | 52 ++++-------------- apps/documenteditor/main/app/view/Toolbar.js | 25 +++++---- .../main/resources/less/toolbar.less | 18 +++--- 5 files changed, 44 insertions(+), 62 deletions(-) diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index 5982df15426838f43e5e2d017cda8a1dfb0fe599..e6c0bf15247198ef62361b4484bf0be03ed66511 100644 GIT binary patch literal 8131 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 Hi_iZ9=k@HH literal 6777 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 mjxgx6ZB_D+++#_zeu;Wv{pEklTZLo* diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 6094c22c4..fee05cace 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -281,3 +281,14 @@ .button-normal-icon(review-next, 16, @toolbar-big-icon-size); .button-normal-icon(review-prev, 17, @toolbar-big-icon-size); .button-normal-icon(btn-dropcap, 18, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-pagebreak', 19, @toolbar-big-icon-size); + +.button-normal-icon(btn-pageorient, 21, @toolbar-big-icon-size); +.button-normal-icon(btn-pagemargins, 22, @toolbar-big-icon-size); +.button-normal-icon(btn-pagesize, 23, @toolbar-big-icon-size); +.button-normal-icon(btn-columns, 24, @toolbar-big-icon-size); +.button-normal-icon(btn-img-align, 25, @toolbar-big-icon-size); +.button-normal-icon(btn-img-group, 26, @toolbar-big-icon-size); +.button-normal-icon(btn-img-bkwd, 27, @toolbar-big-icon-size); +.button-normal-icon(btn-img-frwd, 28, @toolbar-big-icon-size); +.button-normal-icon(btn-img-wrap, 29, @toolbar-big-icon-size); diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index 43ac7fd15..ded87a9b2 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -145,51 +145,19 @@
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
+ + + + +
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
+ + + + +
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 7374ef304..8ce9cc211 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -608,7 +608,7 @@ define([ this.btnColumns = new Common.UI.Button({ id: 'tlb-btn-columns', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-columns', caption: me.capBtnColumns, menu: new Common.UI.Menu({ @@ -658,7 +658,7 @@ define([ this.btnPageOrient = new Common.UI.Button({ id: 'tlb-btn-pageorient', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pageorient', caption: me.capBtnPageOrient, menu: new Common.UI.Menu({ @@ -694,7 +694,7 @@ define([ this.btnPageMargins = new Common.UI.Button({ id: 'tlb-btn-pagemargins', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pagemargins', caption: me.capBtnMargins, menu: new Common.UI.Menu({ @@ -753,7 +753,7 @@ define([ this.btnPageSize = new Common.UI.Button({ id: 'tlb-btn-pagesize', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pagesize', caption: me.capBtnPageSize, menu: new Common.UI.Menu({ @@ -967,34 +967,34 @@ define([ this.toolbarControls.push(this.btnAdvSettings); me.btnImgAlign = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-align', caption: me.capImgAlign, menu: true }); me.btnImgGroup = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-group', caption: me.capImgGroup, menu: true }); me.btnImgForward = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-frwd', caption: me.capImgForward, split: true, menu: true }); me.btnImgBackward = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-bkwd', caption: me.capImgBackward, split: true, menu: true }); me.btnImgWrapping = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-wrap', caption: me.capImgWrapping, menu: true @@ -1205,7 +1205,7 @@ define([ }); if ( me.isCompactView ) - me.setFolded(true); else + me.setFolded(true), me.collapse(); else me.setTab('home'); var top = Common.localStorage.getItem("de-pgmargins-top"), @@ -1304,8 +1304,11 @@ define([ var $slots = $host.find('.btn-slot.btn-pagebreak'); $slots.each(function(index, el) { + var _cls = 'btn-toolbar'; + /x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); + var button = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: _cls, iconCls: 'btn-pagebreak', caption: me.capBtnInsPagebreak, split: true, diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 583d10a67..69181f0b7 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -266,8 +266,8 @@ .button-normal-icon(btn-setmarkers, 21, @toolbar-icon-size); .button-normal-icon(btn-multilevels, 22, @toolbar-icon-size); .button-normal-icon(btn-numbering, 23, @toolbar-icon-size); -.button-normal-icon(btn-pageorient, 24, @toolbar-icon-size); -.button-normal-icon(btn-pagesize, 25, @toolbar-icon-size); +//.button-normal-icon(btn-pageorient, 24, @toolbar-icon-size); +//.button-normal-icon(btn-pagesize, 25, @toolbar-icon-size); .button-normal-icon(btn-paste, 26, @toolbar-icon-size); .button-normal-icon(btn-print, 27, @toolbar-icon-size); .button-normal-icon(btn-redo, 28, @toolbar-icon-size); @@ -297,13 +297,13 @@ .button-normal-icon(mmerge-last, 72, @toolbar-icon-size); .button-normal-icon(mmerge-prev, 73, @toolbar-icon-size); .button-normal-icon(mmerge-first, 74, @toolbar-icon-size); -.button-normal-icon(btn-columns, 75, @toolbar-icon-size); -.button-normal-icon(btn-pagemargins, 76, @toolbar-icon-size); -.button-normal-icon(btn-img-frwd, 83, @toolbar-icon-size); -.button-normal-icon(btn-img-bkwd, 84, @toolbar-icon-size); -.button-normal-icon(btn-img-wrap, 85, @toolbar-icon-size); -.button-normal-icon(btn-img-group, 86, @toolbar-icon-size); -.button-normal-icon(btn-img-align, 87, @toolbar-icon-size); +//.button-normal-icon(btn-columns, 75, @toolbar-icon-size); +//.button-normal-icon(btn-pagemargins, 76, @toolbar-icon-size); +//.button-normal-icon(btn-img-frwd, 83, @toolbar-icon-size); +//.button-normal-icon(btn-img-bkwd, 84, @toolbar-icon-size); +//.button-normal-icon(btn-img-wrap, 85, @toolbar-icon-size); +//.button-normal-icon(btn-img-group, 86, @toolbar-icon-size); +//.button-normal-icon(btn-img-align, 87, @toolbar-icon-size); .button-normal-icon(btn-goback, 88, @toolbar-icon-size); //.button-normal-icon(btn-insertimage, 17, @toolbar-icon-size);