Merge branch 'MAGETWO-53533' of github.com:magento-frontend/magento2ce into PR

Author: Karpenko, Oleksandr

app/design/adminhtml/Magento/backend/Magento_GiftWrapping/web/css/source/_module.less

@@ -82,3 +82,76 @@
         }
     }
 }
+
+//
+//  Stores -> Other Settings -> Gift wrapping (create/edit)
+//  _____________________________________________
+//  TODO UI: remove after page build on ui-components
+
+[class*='adminhtml-giftwrapping-'] {
+    .field-base_price {
+        .admin__field-control {
+            max-width: @field-size__s;
+        }
+
+        .admin__control-addon {
+            > .addafter {
+                &:extend(.admin__addon-prefix all);
+                .lib-vendor-prefix-flex-basis(auto);
+                .lib-vendor-prefix-flex-grow(0);
+                .lib-vendor-prefix-flex-shrink(0);
+                position: relative;
+                z-index: 1;
+            }
+
+            [class*='admin__control-'][class] {
+                & ~ .addafter:last-child {
+                    padding-left: 1rem;
+                    position: static !important;
+                    z-index: 0;
+
+                    > * {
+                        position: relative;
+                        vertical-align: top;
+                        z-index: 1;
+                    }
+                }
+
+                & ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern);
+                    bottom: 0;
+                    box-sizing: border-box;
+                    content: '';
+                    left: 0;
+                    position: absolute;
+                    top: 0;
+                    width: 100%;
+                    z-index: -1;
+                }
+
+                &[disabled] ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern[disabled]);
+                }
+
+                &:focus ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern:focus);
+                }
+
+                &:hover ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern:hover);
+                }
+            }
+        }
+    }
+
+    .field-image {
+        .admin__field-control {
+            padding-top: .8rem;
+
+            > a {
+                display: inline-block;
+                vertical-align: middle;
+            }
+        }
+    }
+}