diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less index 380c542e3..1668f92e3 100644 --- a/apps/common/main/resources/less/combo-border-size.less +++ b/apps/common/main/resources/less/combo-border-size.less @@ -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)"; } } } diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 7a1b1e15a..81447d241 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -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); + } + } + } } \ No newline at end of file diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index d0d3137e8..02bf64d63 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -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; diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index ebb997c02..f211f3567 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -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)"; } } } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 9dde1679f..9ab9acdea 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -144,5 +144,6 @@ .combo-styles { .view, .dropdown-menu { + //background-color: @canvas-content-background; } } \ No newline at end of file