diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
index 712db49e53073417888c45fc72a2855fb0f9917e..4a3219efbb946ffa9ea57d98f058a37174d7f399 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
@@ -16,26 +16,28 @@
</strong>
</div>
<div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
- <fieldset class="fieldset">
- <table class="admin__control-table" id="attribute-labels-table">
- <thead>
- <tr>
- <?php foreach ($block->getStores() as $_store): ?>
- <th class="col-store-view"><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
- <?php endforeach; ?>
- </tr>
- </thead>
- <tbody>
- <tr>
- <?php $_labels = $block->getLabelValues() ?>
- <?php foreach ($block->getStores() as $_store): ?>
- <td class="col-store-view">
- <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<?php echo $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
- </td>
- <?php endforeach; ?>
- </tr>
- </tbody>
- </table>
+ <fieldset class="admin__fieldset fieldset">
+ <div class="admin__control-table-wrapper">
+ <table class="admin__control-table" id="attribute-labels-table">
+ <thead>
+ <tr>
+ <?php foreach ($block->getStores() as $_store): ?>
+ <th class="col-store-view"><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
+ <?php endforeach; ?>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <?php $_labels = $block->getLabelValues() ?>
+ <?php foreach ($block->getStores() as $_store): ?>
+ <td class="col-store-view">
+ <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<?php echo $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+ </td>
+ <?php endforeach; ?>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</fieldset>
</div>
</div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
index 500126c24b53069a1fd20ac1b83de82ee71602bc..8dd7a367f106bb9eee6936ce05976b8cfceb8f80 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -10,11 +10,11 @@
$stores = $block->getStoresSortedBySortOrder();
?>
-<fieldset class="fieldset">
+<fieldset class="admin__fieldset fieldset">
<legend class="legend">
<span><?php echo $block->escapeHtml(__('Manage Options (Values of Your Attribute)')); ?></span>
- </legend>
- <div id="manage-options-panel" data-index="attribute_options_select_container">
+ </legend><br />
+ <div class="admin__control-table-wrapper" id="manage-options-panel" data-index="attribute_options_select_container">
<table class="admin__control-table" data-index="attribute_options_select">
<thead>
<tr id="attribute-options-table">
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
index f83df3ad4da50ccb6554d9812dd6910eb166419d..a9ed1acb6cde6992c2088226bbf9ac678530a49e 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
@@ -10,9 +10,11 @@
$stores = $block->getStoresSortedBySortOrder();
?>
-<fieldset class="fieldset">
- <legend class="legend"><span><?php echo $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')); ?></span></legend>
- <div id="swatch-visual-options-panel">
+<fieldset class="admin__fieldset fieldset">
+ <legend class="legend">
+ <span><?php echo $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')); ?></span>
+ </legend><br />
+ <div class="admin__control-table-wrapper" id="swatch-visual-options-panel">
<table class="data-table clearfix" cellspacing="0">
<thead>
<tr id="swatch-visual-options-table">
@@ -116,5 +118,4 @@ $stores = $block->getStoresSortedBySortOrder();
}
}
</script>
-
</fieldset>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
index 7ecaf06f247ca8ef9cb77ff203006608fc37dd6c..3ecf10b5b8ee0f12bcea4336fa1f88219cc3d327 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
@@ -131,6 +131,7 @@
&._required {
span {
&:after {
+ .lib-css(margin, @form-field-label-asterisk__margin);
color: @validation__color;
content: '*';
}
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index d6319ff95d417955f71953e6e08dad7eb292e50c..567f23c0041ddb6b022fc1eac581ae9787b94624 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -744,6 +744,7 @@
// --------------------------------------
fieldset {
+ min-width: 0;
padding: 20px;
}
@@ -5049,6 +5050,10 @@
}
}
}
+
+ .admin__control-table-wrapper {
+ clear: both;
+ }
}
.catalog-product-set-index {