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

Merge pull request #817 from ONLYOFFICE/feature/pr19-fix-bug-49719

Browse source 
Feature/pr19 fix bug 49719
This commit is contained in:
maxkadushkin 2021-04-20 00:03:28 +03:00 committed by GitHub
parent 9e30429737 d376e2a04e
commit eadc4d14e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/common/main/resources/less/combo-border-size.less
View file

@ -33,23 +33,14 @@
img, .image {
background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0";
background-size: 60px auto;
@media only screen {
//@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
// (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
// (min-resolution: 144dpi) and (max-resolution: 191dpi)
//{
// background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
// background-size: 60px auto;
//}
.pixel-ratio__1_5 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
}
@media (-webkit-min-device-pixel-ratio: 2),
(min-resolution: 2dppx),
(min-resolution: 192dpi)
{
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
background-size: 60px auto;
}
.pixel-ratio__2 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
}
}
}

12
apps/common/main/resources/less/dropdown-menu.less
View file

@ -153,4 +153,16 @@
background-color: @border-divider-ie;
background-color: @border-divider;
}
.dataview {
.item {
.options__icon {
opacity: @component-normal-icon-opacity;
}
.options__icon-huge {
background-position-x: var(--button-huge-normal-icon-offset-x, 0);
}
}
}
}

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

@ -560,6 +560,7 @@
.equation-icon {
.background-ximage-v2('toolbar/math.png', 1500px, @commonimage: true);
opacity: @component-normal-icon-opacity;
.theme-dark & {
-webkit-filter: @img-equition-filter;

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

@ -208,23 +208,14 @@
.combo-border-size.cell-border-type {
img, .image {
background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize.png)";
background-size: 60px auto;
@media only screen {
//@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
// (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
// (min-resolution: 144dpi) and (max-resolution: 191dpi)
//{
// background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
// background-size: 60px auto;
//}
.pixel-ratio__1_5 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
}
@media (-webkit-min-device-pixel-ratio: 2),
(min-resolution: 2dppx),
(min-resolution: 192dpi)
{
background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
background-size: 60px auto;
}
.pixel-ratio__2 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
}
}
}

1
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -144,5 +144,6 @@
.combo-styles {
.view, .dropdown-menu {
//background-color: @canvas-content-background;
}
}