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

Author: Natalia Momotenko

app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php

@@ -52,6 +52,8 @@ protected function _prepareLayout()
                 $this->_srcCurrencyFactory->create()->toOptionArray()
             )->setId(
                 'rate_services'
+            )->setClass(
+                'admin__control-select'
             )->setName(
                 'rate_services'
             )->setValue(

app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currency_index.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <update handle="styles" />
+    <body/>
+</page>

app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml

@@ -15,7 +15,7 @@
 
 <form action="<?php echo $block->getImportFormAction() ?>" method="post" class="import-service">
     <?php echo $block->getBlockHtml('formkey')?>
-    <fieldset class="admin__fieldset">
+    <fieldset class="admin__fieldset admin__fieldset-import-service">
         <?php echo $block->getServicesHtml() ?>
         <?php echo $block->getImportButtonHtml() ?>
     </fieldset>

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

@@ -0,0 +1,15 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.admin__fieldset-import-service {
+    margin: 0 0 @indent__base;
+    .admin__field {
+        margin: 0 0 @indent__base;
+    }
+    > .action-default {
+        #mix-grid .return_length(@field-label-grid__column, @field-grid__columns, @mathSymbol: '+');
+        margin-left: @_length;
+    }
+}

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

@@ -31,6 +31,10 @@
 @field-error-message__border-color: @color-apricot;
 @field-error-message__color: @color-very-dark-gray2;
 
+@field-grid__columns: 9;
+@field-control-grid__column: 4;
+@field-label-grid__column: 3;
+
 //
 //  Form Fields
 //  _____________________________________________
@@ -54,11 +58,11 @@
             &:extend(.abs-field-rows all);
         }
         > .admin__field-control {
-            #mix-grid .column(4,9);
+            #mix-grid .column(@field-control-grid__column, @field-grid__columns);
         }
 
         > .admin__field-label {
-            #mix-grid .column(3,9);
+            #mix-grid .column(@field-label-grid__column, @field-grid__columns);
         }
     }
 }
@@ -164,7 +168,7 @@
 
     &[data-config-scope] {
         &:before {
-            #mix-grid .return_length(7,9);
+            #mix-grid .return_length(7, @field-grid__columns);
             color: @field-scope__color;
             content: attr(data-config-scope);
             display: inline-block;
@@ -175,7 +179,7 @@
             position: absolute;
 
             & {
-                #mix-grid .return_length(2,9);
+                #mix-grid .return_length(2, @field-grid__columns);
                 width: @_length;
             }
         }
@@ -267,7 +271,7 @@
     & > .admin__field:first-child {
         position: static;
         & > .admin__field-label {
-            #mix-grid .column(3, 9);
+            #mix-grid .column(@field-label-grid__column, @field-grid__columns);
             cursor: pointer;
             left: 0;
             opacity: 0;

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

@@ -19,9 +19,9 @@
         .extend__clearer();
         margin-left: ~'-@{temp_gutter}';
     }
-    .return_length(@_columns-min, @_total: @temp_columns) {
+    .return_length(@_columns-min, @_total: @temp_columns, @mathSymbol: '-') {
         @_part: @_columns-min/@_total;
-        @_length: ~'calc( (100%) * @{_part} - @{temp_gutter} )';
+        @_length: ~'calc( (100%) * @{_part} @{mathSymbol} @{temp_gutter} )';
     }
     .width(@_columns-min, @_total: @temp_columns) {
         #mix-grid .return_length(@_columns-min, @_total);