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

[web-apps] fix bug 50030

Browse source
This commit is contained in:
Maxim Kadushkin 2021-04-28 14:10:39 +03:00
parent 64031048ce
commit 134001162c
5 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/colors-table.less
View file

@ -224,6 +224,8 @@
@header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1);
@menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0);
@img-border-type-filter: var(--image-border-types-filter, none);
@img-border-type-filter-selected: var(--image-border-types-filter-selected, none);
// Canvas
// ---------------------------

22
apps/common/main/resources/less/combobox.less
View file

@ -1,5 +1,3 @@
@img-borders-filter: var(--image-border-types-filter);
@img-borders-filter-selected: var(--image-border-types-filter-selected);
.combobox {
display: block;
@ -33,8 +31,8 @@
float: none;
.image {
-webkit-filter: @img-borders-filter;
filter: @img-borders-filter;
-webkit-filter: @img-border-type-filter;
filter: @img-border-type-filter;
}
}
@ -136,22 +134,22 @@
// ------------------------
li {
img {
-webkit-filter: @img-borders-filter;
filter: @img-borders-filter;
-webkit-filter: @img-border-type-filter;
filter: @img-border-type-filter;
}
canvas {
-webkit-filter: @img-borders-filter;
filter: @img-borders-filter;
-webkit-filter: @img-border-type-filter;
filter: @img-border-type-filter;
}
&.selected {
img {
-webkit-filter: @img-borders-filter-selected;
filter: @img-borders-filter-selected;
-webkit-filter: @img-border-type-filter-selected;
filter: @img-border-type-filter-selected;
}
canvas {
-webkit-filter: @img-borders-filter-selected;
filter: @img-borders-filter-selected;
-webkit-filter: @img-border-type-filter-selected;
filter: @img-border-type-filter-selected;
}
}

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 207 B

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

@ -211,11 +211,11 @@
background-size: 60px auto;
.pixel-ratio__1_5 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
}
.pixel-ratio__2 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
}
}
}

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

@ -77,27 +77,19 @@
#id-toolbar-mnu-item-border-width {
.border-size-item {
background: ~"url(@{app-image-const-path}/toolbar/BorderSize.png) no-repeat scroll 0 0";
background-size: 60px auto;
width: 60px;
height: 20px;
margin: -3px 10px -2px;
filter: @component-normal-icon-filter;
filter: @img-border-type-filter;
@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(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
//background-image: ~"url(@{app-image-const-path}/toolbar/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(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
}
}
}