Merge remote-tracking branch 'origin/MAGETWO-42364' into PR-2

Author: Natalia Momotenko

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

@@ -22,7 +22,7 @@ if (!isset($advancedLabel)) {
     $advancedLabel = __('Additional Settings');
 }
 
-$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset ' . $element->getClass();
+$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset' . $element->getClass();
 
 if ($isField) {
     $count = $element->getCountBasicChildren();
@@ -91,11 +91,11 @@ if ($isField) {
 
         <?php if ($element->hasAdvanced() && !$isField): ?>
             <?php echo(!$element->getNoContainer() && $advancedAfter)  ? '</fieldset>' : ''?>
-            <details data-mage-init='{"details": {}}' class="details" id="details<?php /* @escapeNotVerified */ echo $id ?>">
-                <summary class="details-summary" id="details-summary<?php /* @escapeNotVerified */ echo $id ?>">
+            <details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?php /* @escapeNotVerified */ echo $id ?>">
+                <summary class="details-summary admin__collapsible-title" id="details-summary<?php /* @escapeNotVerified */ echo $id ?>">
                     <span><?php /* @escapeNotVerified */ echo $advancedLabel ?></span>
                 </summary>
-                <div class="details-content" id="details-content<?php /* @escapeNotVerified */ echo $id ?>">
+                <div class="details-content admin__fieldset" id="details-content<?php /* @escapeNotVerified */ echo $id ?>">
                     <?php echo $element->getAdvancedChildrenHtml(); ?>
                 </div>
             </details>

app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml

@@ -11,14 +11,16 @@
     <?php if (!$block->getIsReadonly()): ?>
     <div class="import-tax-rates">
         <?php if ($block->getUseContainer()): ?>
-        <form id="import-form" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
+        <form id="import-form" class="admin__fieldset" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
         <?php endif; ?>
             <?php echo $block->getBlockHtml('formkey')?>
-            <fieldset class="fieldset">
-                <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Import Tax Rates') ?></span></legend>
-                <input type="file" name="import_rates_file" class="input-file required-entry"/>
-                <?php echo $block->getButtonHtml('Import Tax Rates', '', 'import-submit') ?>
-            </fieldset>
+            <div class="fieldset admin__field">
+                <label for="import_rates_file" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Import Tax Rates') ?></span></label>
+                <div class="admin__field-control">
+                    <input type="file" id="import_rates_file" name="import_rates_file" class="input-file required-entry"/>
+                    <?php echo $block->getButtonHtml('Import Tax Rates', '', 'import-submit') ?>
+                </div>
+            </div>
         <?php if ($block->getUseContainer()): ?>
         </form>
         <?php endif; ?>
@@ -44,13 +46,15 @@ require(['jquery', "mage/mage", "loadingPopup"], function(jQuery){
     <?php endif; ?>
     <div class="export-tax-rates <?php if ($block->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
         <?php if ($block->getUseContainer()): ?>
-        <form id="export_form" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
+        <form id="export_form" class="admin__fieldset" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
         <?php endif; ?>
             <?php echo $block->getBlockHtml('formkey')?>
-            <fieldset class="fieldset">
-                <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Export Tax Rates') ?></span></legend>
-                <?php echo $block->getButtonHtml('Export Tax Rates', "this.form.submit()") ?>
-            </fieldset>
+            <div class="fieldset admin__field">
+                <span class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Export Tax Rates') ?></span></span>
+                <div class="admin__field-control">
+                    <?php echo $block->getButtonHtml('Export Tax Rates', "this.form.submit()") ?>
+                </div>
+            </div>
         <?php if ($block->getUseContainer()): ?>
         </form>
         <?php endif; ?>

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

@@ -7,3 +7,7 @@
     -webkit-appearance: none;
     &:extend(.action-default, button all);
 }
+
+.import-export-tax-rates {
+    padding-top: @indent__base;
+}