From 2ba6fdd351f7eabb59bb9e3ab2208bde5e25a324 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 17 Feb 2021 13:46:21 +0300 Subject: [PATCH] [DE] fixed some components for x1.5 scaling --- apps/common/main/resources/less/spinner.less | 1 + .../main/app/view/HeaderFooterSettings.js | 16 ++++++++-------- apps/documenteditor/main/app/view/Toolbar.js | 14 +++++++------- .../main/resources/img/toolbar/colontitules.png | Bin 167 -> 0 bytes .../resources/img/toolbar/colontitules@2x.png | Bin 239 -> 0 bytes .../documenteditor/main/resources/less/app.less | 2 ++ .../main/resources/less/rightmenu.less | 11 +++++------ .../main/resources/less/toolbar.less | 13 ++++++++----- 8 files changed, 31 insertions(+), 26 deletions(-) delete mode 100644 apps/documenteditor/main/resources/img/toolbar/colontitules.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/colontitules@2x.png diff --git a/apps/common/main/resources/less/spinner.less b/apps/common/main/resources/less/spinner.less index f64f479ff..62b2e0e28 100644 --- a/apps/common/main/resources/less/spinner.less +++ b/apps/common/main/resources/less/spinner.less @@ -19,6 +19,7 @@ position: relative; width: @trigger-width; height: @spin-height/2 - 1; + height: calc(@spin-height/2 - 1px/@pixel-ratio-factor); padding: 0; margin: 0; border: none; diff --git a/apps/documenteditor/main/app/view/HeaderFooterSettings.js b/apps/documenteditor/main/app/view/HeaderFooterSettings.js index 941ef201e..df26cf3b6 100644 --- a/apps/documenteditor/main/app/view/HeaderFooterSettings.js +++ b/apps/documenteditor/main/app/view/HeaderFooterSettings.js @@ -221,20 +221,20 @@ define([ createDelayedControls: function() { var me = this; var _arrPosition = [ - [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'icon-right-panel btn-colontitul-tl', 'headerfooter-button-top-left', this.textTopLeft], - [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'icon-right-panel btn-colontitul-tc', 'headerfooter-button-top-center', this.textTopCenter], - [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_RIGHT, 'icon-right-panel btn-colontitul-tr', 'headerfooter-button-top-right', this.textTopRight], - [c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'icon-right-panel btn-colontitul-bl', 'headerfooter-button-bottom-left', this.textBottomLeft], - [c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'icon-right-panel btn-colontitul-bc', 'headerfooter-button-bottom-center', this.textBottomCenter], - [c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_RIGHT, 'icon-right-panel btn-colontitul-br', 'headerfooter-button-bottom-right', this.textBottomRight] + [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'page-number-top-left', 'headerfooter-button-top-left', this.textTopLeft], + [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'page-number-top-center', 'headerfooter-button-top-center', this.textTopCenter], + [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_RIGHT, 'page-number-top-right', 'headerfooter-button-top-right', this.textTopRight], + [c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'page-number-bottom-left', 'headerfooter-button-bottom-left', this.textBottomLeft], + [c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'page-number-bottom-center', 'headerfooter-button-bottom-center', this.textBottomCenter], + [c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_RIGHT, 'page-number-bottom-right', 'headerfooter-button-bottom-right', this.textBottomRight] ]; this._btnsPosition = []; _.each(_arrPosition, function(item, index, list){ var _btn = new Common.UI.Button({ parentEl: $('#'+item[3]), - cls: 'btn-options huge bg-white', - iconCls: item[2], + cls: 'btn-options huge-1 bg-white', + iconCls: 'options__icon options__icon-huge ' + item[2], posWhere:item[0], posAlign:item[1], hint: item[4] diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index ab5cb93d2..e45eefed8 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1882,55 +1882,55 @@ define([ allowScrollbar: false, store: new Common.UI.DataViewStore([ { - offsety: 132, allowSelected: false, + iconname: 'page-number-top-left', data: { type: c_pageNumPosition.PAGE_NUM_POSITION_TOP, subtype: c_pageNumPosition.PAGE_NUM_POSITION_LEFT } }, { - offsety: 99, allowSelected: false, + iconname: 'page-number-top-center', data: { type: c_pageNumPosition.PAGE_NUM_POSITION_TOP, subtype: c_pageNumPosition.PAGE_NUM_POSITION_CENTER } }, { - offsety: 66, allowSelected: false, + iconname: 'page-number-top-right', data: { type: c_pageNumPosition.PAGE_NUM_POSITION_TOP, subtype: c_pageNumPosition.PAGE_NUM_POSITION_RIGHT } }, { - offsety: 33, allowSelected: false, + iconname: 'page-number-bottom-left', data: { type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, subtype: c_pageNumPosition.PAGE_NUM_POSITION_LEFT } }, { - offsety: 0, allowSelected: false, + iconname: 'page-number-bottom-center', data: { type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, subtype: c_pageNumPosition.PAGE_NUM_POSITION_CENTER } }, { - offsety: 165, allowSelected: false, + iconname: 'page-number-bottom-right', data: { type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, subtype: c_pageNumPosition.PAGE_NUM_POSITION_RIGHT } } ]), - itemTemplate: _.template('
') + itemTemplate: _.template('
') }); _conf && this.mnuPageNumberPosPicker.setDisabled(_conf.disabled); diff --git a/apps/documenteditor/main/resources/img/toolbar/colontitules.png b/apps/documenteditor/main/resources/img/toolbar/colontitules.png deleted file mode 100644 index 90c913f910d02b121cd9713170905ec8f26a25fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^ia>mfi5bK?&3Ft*@dWsUxB_Vx7!dit`Yn*pToU9L z%y9Tf+X}Z|K(4!|i(^OyW3mFnjsMIC#Ra<4ZwUOUFW6+jQ6ce1K_p1oK;^A{LMm^C zhtdDzC#8Z|Vx1>_nqwq2>B*BR51o3ZO;(xiA=0M8FxewkRbaB*OrVhrp00i_>zopr E0H*OXwg3PC diff --git a/apps/documenteditor/main/resources/img/toolbar/colontitules@2x.png b/apps/documenteditor/main/resources/img/toolbar/colontitules@2x.png deleted file mode 100644 index 7b89d1e926dcc54bdfebedcee8bcf467528b2843..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^P7Dl;JuJ*X)|~g5tAUhgfKP}kkaocU9}VRBfD&va zL4Lsuo?cI$JrDQ2XA2Z*_H=O!sbGA2b0aU4p@2)ExFffT1G`E%r_X;?h4yQ17Lh-{ z)cr}y-Xiz?^~77%g5g>7T~n@X(&cDU=s43SzLl?V>9^P;##^ud(7tKF;wa#fcAQ%} z&Hkpr%(=>YUIPWpdU7PpBNoLAup}Nn(N@^3%F*;f93