Merge remote-tracking branch 'origin/MAGETWO-37124' into PR

Author: Natalia Momotenko

app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less

@@ -16,7 +16,7 @@
 @field-control__background-color: @color-white;
 @field-control__border-color: @action__border-color;
 @field-control__border-radius: 1px;
-@field-control__border-width: .1rem;
+@field-control__border-width: 1px;
 @field-control__color: @color-very-dark-gray-black;
 @field-control__font-size: @action__font-size;
 @field-control__line-height: @action__line-height;

app/design/adminhtml/Magento/backend/web/css/source/variables/_actions.less

@@ -10,7 +10,11 @@
 @action__border-color: @color-gray68;
 @action__font-size: @font-size__base;
 @action__line-height: @line-height__base;
-@action__padding-top: round(((@field-control__height - @field-control__font-size * @field-control__line-height - @field-control__border-width * 2) / 2), 1);
+
+@action__padding-top: round(((@field-control__height -
+    (@field-control__font-size * @field-control__line-height) -
+    ((unit(@field-control__border-width) / @font-rem-ratio) * 2)) / 2), 1);
+
 @action__padding-bottom: @field-control__padding-top;
 @action__height: 3.3rem;