Fix Bug 43986

apps/common/main/lib/component/ComboBorderSize.js

@@ -142,7 +142,7 @@ define([
             if (record.get('value')>0) {
                 formcontrol[0].innerHTML = '';
                 formcontrol.removeClass('text').addClass('image');
-                formcontrol.css('background-position', '0 -' + record.get('offsety') + 'px');
+                formcontrol.css('background-position', '10px -' + record.get('offsety') + 'px');
             } else {
                 formcontrol[0].innerHTML = this.txtNoBorders;
                 formcontrol.removeClass('image').addClass('text');
@@ -229,7 +229,7 @@ define([
                 '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
                 '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                     '<% _.each(items, function(item) { %>',
-                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem" style="padding: 2px 0;">',
+                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem" style="padding: 2px 0 2px 10px;">',
                             '<span style="margin-top: 0;"></span>',
                             '<% if (item.offsety!==undefined) { %>',
                                 '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="left" style="background-position: 0 -<%= item.offsety %>px;">',
@@ -265,7 +265,7 @@ define([
             var formcontrol = $(this.el).find('.form-control');
             formcontrol[0].innerHTML = '';
             formcontrol.removeClass('text').addClass('image');
-            formcontrol.css('background-position', '0 -' + record.get('offsety') + 'px');
+            formcontrol.css('background-position', '10px -' + record.get('offsety') + 'px');
         }
     }, Common.UI.ComboBorderType || {}));
 

apps/common/main/resources/less/combo-border-size.less

@@ -16,7 +16,7 @@
         }
 
         img {
-            width:69px;
+            width:60px;
             height:20px;
             background-color: transparent;
         }
@@ -24,5 +24,23 @@
 
     img, .image {
         background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0 #fff";
+
+        @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;
+            //}
+
+            @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;
+            }
+        }
     }
 }

apps/spreadsheeteditor/main/resources/less/rightmenu.less

@@ -300,5 +300,23 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 .combo-border-size.cell-border-type {
     img, .image {
         background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize.png)";
+
+        @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;
+          //}
+
+            @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;
+            }
+        }
     }
 }

apps/spreadsheeteditor/main/resources/less/toolbar.less

@@ -111,10 +111,27 @@
 #id-toolbar-mnu-item-border-width {
     .border-size-item {
         background: ~"url(@{app-image-const-path}/toolbar/BorderSize.png) no-repeat scroll 0 0";
-        width: 80px;
+        width: 60px;
         height: 20px;
-        margin-top: -3px;
+        margin: -3px 10px -2px;
-        margin-bottom: -2px;
+
+        @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;
+            //}
+
+            @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;
+            }
+        }
     }
 }