Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] fixed some components for x1.5 scaling

Browse source
This commit is contained in:
Maxim Kadushkin 2021-02-17 13:46:21 +03:00
parent 9756209cb8
commit 2ba6fdd351
8 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/resources/less/spinner.less
View file

@ -19,6 +19,7 @@
position: relative; position: relative;
width: @trigger-width; width: @trigger-width;
height: @spin-height/2 - 1; height: @spin-height/2 - 1;
height: calc(@spin-height/2 - 1px/@pixel-ratio-factor);
padding: 0; padding: 0;
margin: 0; margin: 0;
border: none; border: none;

16
apps/documenteditor/main/app/view/HeaderFooterSettings.js
View file

@ -221,20 +221,20 @@ define([
createDelayedControls: function() { createDelayedControls: function() {
var me = this; var me = this;
var _arrPosition = [ 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_LEFT, 'page-number-top-left', '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_CENTER, 'page-number-top-center', '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_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, 'icon-right-panel btn-colontitul-bl', 'headerfooter-button-bottom-left', this.textBottomLeft], [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, 'icon-right-panel btn-colontitul-bc', 'headerfooter-button-bottom-center', this.textBottomCenter], [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, 'icon-right-panel btn-colontitul-br', 'headerfooter-button-bottom-right', this.textBottomRight] [c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_RIGHT, 'page-number-bottom-right', 'headerfooter-button-bottom-right', this.textBottomRight]
]; ];
this._btnsPosition = []; this._btnsPosition = [];
_.each(_arrPosition, function(item, index, list){ _.each(_arrPosition, function(item, index, list){
var _btn = new Common.UI.Button({ var _btn = new Common.UI.Button({
parentEl: $('#'+item[3]), parentEl: $('#'+item[3]),
cls: 'btn-options huge bg-white', cls: 'btn-options huge-1 bg-white',
iconCls: item[2], iconCls: 'options__icon options__icon-huge ' + item[2],
posWhere:item[0], posWhere:item[0],
posAlign:item[1], posAlign:item[1],
hint: item[4] hint: item[4]

14
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1882,55 +1882,55 @@ define([
allowScrollbar: false, allowScrollbar: false,
store: new Common.UI.DataViewStore([ store: new Common.UI.DataViewStore([
{ {
offsety: 132,
allowSelected: false, allowSelected: false,
iconname: 'page-number-top-left',
data: { data: {
type: c_pageNumPosition.PAGE_NUM_POSITION_TOP, type: c_pageNumPosition.PAGE_NUM_POSITION_TOP,
subtype: c_pageNumPosition.PAGE_NUM_POSITION_LEFT subtype: c_pageNumPosition.PAGE_NUM_POSITION_LEFT
} }
}, },
{ {
offsety: 99,
allowSelected: false, allowSelected: false,
iconname: 'page-number-top-center',
data: { data: {
type: c_pageNumPosition.PAGE_NUM_POSITION_TOP, type: c_pageNumPosition.PAGE_NUM_POSITION_TOP,
subtype: c_pageNumPosition.PAGE_NUM_POSITION_CENTER subtype: c_pageNumPosition.PAGE_NUM_POSITION_CENTER
} }
}, },
{ {
offsety: 66,
allowSelected: false, allowSelected: false,
iconname: 'page-number-top-right',
data: { data: {
type: c_pageNumPosition.PAGE_NUM_POSITION_TOP, type: c_pageNumPosition.PAGE_NUM_POSITION_TOP,
subtype: c_pageNumPosition.PAGE_NUM_POSITION_RIGHT subtype: c_pageNumPosition.PAGE_NUM_POSITION_RIGHT
} }
}, },
{ {
offsety: 33,
allowSelected: false, allowSelected: false,
iconname: 'page-number-bottom-left',
data: { data: {
type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM,
subtype: c_pageNumPosition.PAGE_NUM_POSITION_LEFT subtype: c_pageNumPosition.PAGE_NUM_POSITION_LEFT
} }
}, },
{ {
offsety: 0,
allowSelected: false, allowSelected: false,
iconname: 'page-number-bottom-center',
data: { data: {
type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM,
subtype: c_pageNumPosition.PAGE_NUM_POSITION_CENTER subtype: c_pageNumPosition.PAGE_NUM_POSITION_CENTER
} }
}, },
{ {
offsety: 165,
allowSelected: false, allowSelected: false,
iconname: 'page-number-bottom-right',
data: { data: {
type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, type: c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM,
subtype: c_pageNumPosition.PAGE_NUM_POSITION_RIGHT subtype: c_pageNumPosition.PAGE_NUM_POSITION_RIGHT
} }
} }
]), ]),
itemTemplate: _.template('<div id="<%= id %>" class="item-pagenumber" style="background-position: 0 -<%= offsety %>px"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-pagenumber options__icon options__icon-huge <%= iconname %>"></div>')
}); });
_conf && this.mnuPageNumberPosPicker.setDisabled(_conf.disabled); _conf && this.mnuPageNumberPosPicker.setDisabled(_conf.disabled);

BIN
apps/documenteditor/main/resources/img/toolbar/colontitules.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 167 B

BIN
apps/documenteditor/main/resources/img/toolbar/colontitules@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 239 B

2
apps/documenteditor/main/resources/less/app.less
View file

@ -160,6 +160,8 @@
--big-icon-background-image: ~"url(@{app-image-const-path}/iconsbig@2x.png)"; --big-icon-background-image: ~"url(@{app-image-const-path}/iconsbig@2x.png)";
--huge-icon-background-image: ~"url(@{app-image-const-path}/iconshuge@2x.png)"; --huge-icon-background-image: ~"url(@{app-image-const-path}/iconshuge@2x.png)";
} }
@huge-icon-background-image: var(--huge-icon-background-image);
} }
.font-size-small { .font-size-small {

11
apps/documenteditor/main/resources/less/rightmenu.less
View file

@ -18,12 +18,11 @@
.background-ximage-v2('right-panels/RightPanelBigBtns.png', 74px, @commonimage: false); .background-ximage-v2('right-panels/RightPanelBigBtns.png', 74px, @commonimage: false);
} }
.button-normal-icon(btn-colontitul-tl, 3, @huge-icon-size, @button-huge-normal-icon-offset-x); .ie {
.button-normal-icon(btn-colontitul-tc, 4, @huge-icon-size, @button-huge-normal-icon-offset-x); .options__icon.options__icon-huge {
.button-normal-icon(btn-colontitul-tr, 5, @huge-icon-size, @button-huge-normal-icon-offset-x); .background-ximage('@{app-image-path}/iconshuge.png', '@{app-image-path}/iconshuge@2x.png', 40px);
.button-normal-icon(btn-colontitul-bl, 6, @huge-icon-size, @button-huge-normal-icon-offset-x); }
.button-normal-icon(btn-colontitul-bc, 7, @huge-icon-size, @button-huge-normal-icon-offset-x); }
.button-normal-icon(btn-colontitul-br, 8, @huge-icon-size, @button-huge-normal-icon-offset-x);
.button-normal-icon(btn-wrap-none, 9, @huge-icon-size, @button-xhuge-normal-icon-offset-x); .button-normal-icon(btn-wrap-none, 9, @huge-icon-size, @button-xhuge-normal-icon-offset-x);
.button-normal-icon(btn-wrap-parallel, 10, @huge-icon-size, @button-xhuge-normal-icon-offset-x); .button-normal-icon(btn-wrap-parallel, 10, @huge-icon-size, @button-xhuge-normal-icon-offset-x);

13
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -85,8 +85,8 @@
// page number position // page number position
.menu-pageposition { .menu-pageposition {
.dataview { .dataview {
width: 125px; width: 144px;
height: 85px; height: 100px;
margin: 0 10px; margin: 0 10px;
&.disabled { &.disabled {
@ -103,9 +103,12 @@
} }
.item-pagenumber { .item-pagenumber {
.background-ximage('@{app-image-path}/toolbar/colontitules.png', '@{app-image-path}/toolbar/colontitules@2x.png', 33px); .ie & {
width: 33px; .background-ximage('@{app-image-path}/iconshuge.png', '@{app-image-path}/iconshuge@2x.png', 40px);
height: 33px; }
width: 40px;
height: 40px;
} }
} }