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

Merge pull request #1620 from ONLYOFFICE/feature/change-division-in-styles

Browse source 
change division in styles
This commit is contained in:
maxkadushkin 2022-03-14 12:08:52 +03:00 committed by GitHub
parent 5fca9dce64 fe65d82e99
commit 19bfe820b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/combo-dataview.less
View file

@ -111,7 +111,7 @@
.box-shadow(none); .box-shadow(none);
@minus-px-ie: -1px; @minus-px-ie: -1px;
@minus-px: calc(-1px / @pixel-ratio-factor); @minus-px: calc((-1px / @pixel-ratio-factor));
margin: 0 @minus-px-ie @minus-px-ie 0; margin: 0 @minus-px-ie @minus-px-ie 0;
margin: 0 @minus-px @minus-px 0; margin: 0 @minus-px @minus-px 0;
height: @combo-dataview-height; height: @combo-dataview-height;

16
apps/common/main/resources/less/slider.less
View file

@ -8,13 +8,13 @@
.track { .track {
@track-height: 4px; @track-height: 4px;
height: @track-height; height: @track-height;
border: @track-height / 2 solid @border-regular-control-ie; border: (@track-height / 2) solid @border-regular-control-ie;
border: @track-height / 2 solid @border-regular-control; border: (@track-height / 2) solid @border-regular-control;
border-radius: @track-height / 2; border-radius: (@track-height / 2);
background-color: @border-regular-control-ie; background-color: @border-regular-control-ie;
background-color: @border-regular-control; background-color: @border-regular-control;
width: calc(100% + @track-height); width: calc(100% + @track-height);
margin-left: -@track-height / 2; margin-left: (-@track-height / 2);
} }
.thumb { .thumb {
@ -26,10 +26,10 @@
border: @scaled-one-px-value solid @icon-normal; border: @scaled-one-px-value solid @icon-normal;
background-color: @background-normal-ie; background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border-radius: @thumb-width / 2; border-radius: (@thumb-width / 2);
top: 3px; top: 3px;
margin-left: @thumb-width / -2; margin-left: (@thumb-width / -2);
&.active { &.active {
} }
@ -46,14 +46,14 @@
height: calc(100% + @track-height); height: calc(100% + @track-height);
width: @track-height; width: @track-height;
margin-left: 0; margin-left: 0;
margin-top: -@track-height / 2; margin-top: (-@track-height / 2);
} }
.thumb { .thumb {
@thumb-width: 12px; @thumb-width: 12px;
top: auto; top: auto;
left: 3px; left: 3px;
margin-left: 0; margin-left: 0;
margin-top: @thumb-width / -2; margin-top: (@thumb-width / -2);
} }
} }
} }

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

@ -18,7 +18,7 @@
display: block; display: block;
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); height: calc(@spin-height/2 - 1px/@pixel-ratio-factor);
padding: 0; padding: 0;
margin: 0; margin: 0;

12
test/spreadsheeteditor/main/resources/less/asc-mixins.less
View file

@ -87,8 +87,8 @@
.pixel-ratio__1_5 { .pixel-ratio__1_5 {
@ratio: 1.5; @ratio: 1.5;
@one-px: 1px / @ratio; @one-px: (1px / @ratio);
@two-px: 2px / @ratio; @two-px: (2px / @ratio);
--pixel-ratio-factor: @ratio; --pixel-ratio-factor: @ratio;
--scaled-one-pixel: @one-px; --scaled-one-pixel: @one-px;
@ -100,8 +100,8 @@
.pixel-ratio__1_25 { .pixel-ratio__1_25 {
@ratio: 1.25; @ratio: 1.25;
@one-px: 1px / @ratio; @one-px: (1px / @ratio);
@two-px: 2px / @ratio; @two-px: (2px / @ratio);
--pixel-ratio-factor: @ratio; --pixel-ratio-factor: @ratio;
--scaled-one-pixel: @one-px; --scaled-one-pixel: @one-px;
@ -110,8 +110,8 @@
.pixel-ratio__1_75 { .pixel-ratio__1_75 {
@ratio: 1.75; @ratio: 1.75;
@one-px: 1px / @ratio; @one-px: (1px / @ratio);
@two-px: 2px / @ratio; @two-px: (2px / @ratio);
--pixel-ratio-factor: @ratio; --pixel-ratio-factor: @ratio;
--scaled-one-pixel: @one-px; --scaled-one-pixel: @one-px;