Merge remote-tracking branch 'origin/MAGETWO-35172' into UI

Author: Natalia Momotenko

app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/module.less

@@ -49,32 +49,32 @@
     }
 
     .attribute-change-checkbox {
+        background: #fff;
         display: block;
         margin-top: 5px;
         .label {
             float: none;
             padding: 0;
             width: auto;
         }
-        .checkbox {
-            margin-right: 5px;
-            width: auto;
-        }
     }
 
     .field-price,
     .field-special_price,
     .field-gift_wrapping_price,
     .field-msrp,
+    .field-cost,
     .field-gift_wrapping_price {
-        .addon > input {
-            padding-left: 23px;
-        }
-        .addafter {
-            > strong {
-                left: 5px;
-                position: absolute;
-                top: 3px;
+        .control {
+            .addon > input {
+                padding-left: 23px;
+            }
+            .addafter {
+                > strong {
+                    left: 5px;
+                    position: absolute;
+                    top: 3px;
+                }
             }
         }
     }
@@ -108,31 +108,21 @@
                 .addafter + .addafter {
                     border-width: 1px 1px 1px 0;
                     border-style: solid;
-                    height: 28px;
+                    height: 31px;
                     right: 0;
                     position: absolute;
                     top: 0;
                 }
                 .addafter strong {
-                    line-height: 28px;
+                    line-height: 31px;
                 }
                 > input:focus + .addafter + .addafter {
-                    box-shadow: 0 0 8px rgba(82, 168, 236, .6);
+                    border-color: #007bdb;
                 }
             }
         }
     }
 
-    .field-gift_message_available,
-    .field-gift_wrapping_available {
-        .addon {
-            > input[type="checkbox"] {
-                width: auto;
-                margin-right: 5px;
-            }
-        }
-    }
-
     .fieldset > .addafter {
         display: none;
     }

app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module.less

@@ -612,7 +612,7 @@
   border-radius: 0 2px 2px 0;
 }
 
-.field-price input {
+.field-price input[type="text"] {
   border-width: 1px 1px 1px 0;
 }
 

app/design/adminhtml/Magento/backend/web/css/styles-old.less

@@ -1318,16 +1318,16 @@ input.mage-error ~ .addafter {
 // --------------------------------------
 
 .addon {
-    input {
-        border-width: 1px 0 1px 1px;
+    input[type="text"] {
+        border-width: 1px 1px 1px 0;
         ~ .addafter strong {
             .field-price & {
                 font-size: 18px;
             }
             display: inline-block;
             background: #fff;
             line-height: 24px;
-            margin: 0 3px 0 -2px;
+            margin: 0 3px 0 0;
             padding-left: 4px;
             padding-right: 4px;
             position: relative;
@@ -1347,11 +1347,11 @@ input.mage-error ~ .addafter {
         background: none;
         color: #a6a6a6;
         border-width: 1px 1px 1px 0;
-        border-radius: 2px 2px 0 0;
+        border-radius: 1px 1px 0 0;
         padding: 0;
         border-color: #ada89e;
     }
-    input,
+    input[type="text"],
     select {
         &[disabled],
         &[readonly] {
@@ -1366,6 +1366,14 @@ input.mage-error ~ .addafter {
     }
 }
 
+.field-weight {
+    .addon {
+        input[type="text"] {
+            border-width: 1px 0 1px 1px;
+        }
+    }
+}
+
 .field.type-price .addon,
 .field-price .addon,
 .field-special_price .addon,
@@ -1385,21 +1393,14 @@ input.mage-error ~ .addafter {
 .field-special_price .addon .addafter,
 .field-msrp .addon .addafter {
     border-width: 1px 0 1px 1px;
-    border-radius: 2px 0 0 2px;
-}
-
-.field.type-price .addon input:first-child,
-.field-price .addon input:first-child,
-.field-special_price .addon input:first-child,
-.field-msrp .addon input:first-child {
-    border-radius: 0 2px 2px 0;
+    border-radius: 1px 0 0 1px;
 }
 
-.field.type-price input,
-.field-price input,
-.field-special_price input,
-.field-msrp input {
-    border-width: 1px 1px 1px 0;
+.field.type-price .addon input[type=text]:first-child,
+.field-price .addon input[type=text]:first-child,
+.field-special_price .addon input[type=text]:first-child,
+.field-msrp .addon input[type=text]:first-child {
+    border-radius: 0 1px 1px 0;
 }
 
 .field.type-price input:focus,

app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css

@@ -1287,14 +1287,14 @@ span.required {
 
 .addon textarea:first-child,
 .addon select:first-child,
-.addon input:first-child,
+.addon input[type=text]:first-child,
 .addon .addbefore:first-child {
     border-radius: 0;
 }
 
 .addon textarea:last-child,
 .addon select:last-child,
-.addon input:last-child,
+.addon input[type=text]:last-child,
 .addon .addafter:last-child {
     border-radius: 0;
 }
@@ -1350,14 +1350,9 @@ span.required {
 
 .field-price .addon .addafter {
     border-width: 1px 0 1px 1px;
-    border-radius: 4px 0 0 4px;
+    border-radius: 1px 0 0 1px;
 }
 
-.field-price .addon textarea:first-child,
-.field-price .addon select:first-child,
-.field-price .addon input:first-child {
-    border-radius: 0 4px 4px 0;
-}
 
 /*
     Form tooltip