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

Merge pull request #1095 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-08-18 15:48:06 +03:00 committed by GitHub
parent 4c5d962c4f 18af166038
commit 8a76723edf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 55 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
apps/common/main/resources/less/asc-mixins.less
View file

@ -231,6 +231,53 @@
}
}
.background-ximage-all(@image, @w: auto, @h: auto, @repeat: no-repeat, @commonimage: true) {
.choose-image-path(@commonimage);
@imagepath: '@{path}/@{image}';
background-image: if(@icon-src-base64, data-uri(%("%s", '@{imagepath}')), ~"url(@{imagepath})");
background-repeat: @repeat;
@1d5ximage: replace(@imagepath, '\.png$', '@1.5x.png');
@1d75ximage: replace(@imagepath, '\.png$', '@1.75x.png');
@1d25ximage: replace(@imagepath, '\.png$', '@1.25x.png');
@2ximage: replace(@imagepath, '\.png$', '@2x.png');
@media only screen {
@media (-webkit-min-device-pixel-ratio: 1.25) and (-webkit-max-device-pixel-ratio: 1.49),
(min-resolution: 1.25dppx) and (max-resolution: 1.49dppx),
(min-resolution: 120dpi) and (max-resolution: 143dpi)
{
background-image: ~"url(@{1d25ximage})";
background-size: @w @h;
}
@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.74),
(min-resolution: 1.5dppx) and (max-resolution: 1.74dppx),
(min-resolution: 144dpi) and (max-resolution: 167dpi)
{
background-image: ~"url(@{1d5ximage})";
background-size: @w @h;
}
@media (-webkit-min-device-pixel-ratio: 1.75) and (-webkit-max-device-pixel-ratio: 1.9),
(min-resolution: 1.75dppx) and (max-resolution: 1.9dppx),
(min-resolution: 168dpi) and (max-resolution: 191dpi)
{
background-image: ~"url(@{1d75ximage})";
background-size: @w @h;
}
@media (-webkit-min-device-pixel-ratio: 2),
(min-resolution: 2dppx),
(min-resolution: 192dpi)
{
background-image: ~"url(@{2ximage})";
background-size: @w @h;
}
}
}
.img-commonctrl {
&.img-colored {
filter: none;

4
apps/common/main/resources/less/dimension-picker.less
View file

@ -21,13 +21,13 @@
.dimension-picker-unhighlighted {
//background: transparent repeat scroll 0 0;
.background-ximage-v2('dimension-picker/dimension-unhighlighted.png', 18px);
.background-ximage-all('dimension-picker/dimension-unhighlighted.png', 18px);
background-repeat: repeat;
}
.dimension-picker div.dimension-picker-highlighted {
//background: transparent repeat scroll 0 0;
.background-ximage-v2('dimension-picker/dimension-highlighted.png', 18px);
.background-ximage-all('dimension-picker/dimension-highlighted.png', 18px);
background-repeat: repeat;
}

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

@ -11,6 +11,8 @@
border: @track-height / 2 solid @border-regular-control-ie;
border: @track-height / 2 solid @border-regular-control;
border-radius: @track-height / 2;
background-color: @border-regular-control-ie;
background-color: @border-regular-control;
width: calc(100% + @track-height);
margin-left: -@track-height / 2;
}

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

@ -39,7 +39,7 @@
}
.item-gradient {
.background-ximage-v2('right-panels/gradients.png', 150px);
.background-ximage-all('right-panels/gradients.png', 150px);
width:50px;
height:50px;

2
apps/presentationeditor/main/resources/less/rightmenu.less
View file

@ -33,7 +33,7 @@
}
.item-gradient {
.background-ximage('@{common-image-path}/right-panels/gradients.png', '@{common-image-path}/right-panels/gradients@2x.png', 150px);
.background-ximage-all('right-panels/gradients.png', 150px);
width:50px;
height:50px;
}

2
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -108,7 +108,7 @@
.item-theme {
width: 88px;
height: 40px;
.background-ximage-v2('../../../../../../sdkjs/common/Images/themes_thumbnail.png', 88px);
.background-ximage-all('../../../../../../sdkjs/common/Images/themes_thumbnail.png', 88px);
background-size: cover
}

2
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View file

@ -27,7 +27,7 @@
}
.item-gradient {
.background-ximage('@{common-image-path}/right-panels/gradients.png', '@{common-image-path}/right-panels/gradients@2x.png', 150px);
.background-ximage-all('right-panels/gradients.png', 150px);
width:50px;
height:50px;
}