MAGETWO-55393: [Github #5636] Many store views break the page

undefined-olha · undefined-olha · commit e5bee153d67f · 2016-07-20T16:56:12.000+03:00
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
@@ -16,7 +16,7 @@
         </strong>
     </div>
     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
-        <fieldset class="fieldset">
+        <fieldset class="admin__fieldset fieldset">
             <table class="admin__control-table" id="attribute-labels-table">
                 <thead>
                 <tr>
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
@@ -10,9 +10,9 @@
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
-<fieldset class="fieldset">
+<fieldset class="admin__fieldset fieldset">
     <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Options (Values of Your Attribute)') ?></span></legend>
-    <div id="manage-options-panel" data-index="attribute_options_select_container">
+    <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
@@ -10,9 +10,9 @@
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
-<fieldset class="fieldset">
+<fieldset class="admin__fieldset fieldset">
     <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (Values of Your Attribute)') ?></span></legend>
-    <div id="swatch-visual-options-panel">
+    <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">
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
@@ -131,6 +131,7 @@
         &._required {
             span {
                 &:after {
+                    .lib-css(margin, @form-field-label-asterisk__margin);
                     color: @field-label__required__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
@@ -744,6 +744,7 @@
     //  --------------------------------------
 
     fieldset {
+        min-width: 0;
         padding: 20px;
     }
 
@@ -5049,6 +5050,10 @@
             }
         }
     }
+
+    .admin__control-table-wrapper {
+        clear: both;
+    }
 }
 
 .catalog-product-set-index {

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@`
`131`	`131`	`&._required {`
`132`	`132`	`span {`
`133`	`133`	`&:after {`
	`134`	`+ .lib-css(margin, @form-field-label-asterisk__margin);`
`134`	`135`	`color: @field-label__required__color;`
`135`	`136`	`content: '*';`
`136`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -744,6 +744,7 @@`
`744`	`744`	`// --------------------------------------`
`745`	`745`
`746`	`746`	`fieldset {`
	`747`	`+ min-width: 0;`
`747`	`748`	`padding: 20px;`
`748`	`749`	`}`
`749`	`750`
`@@ -5049,6 +5050,10 @@`
`5049`	`5050`	`}`
`5050`	`5051`	`}`
`5051`	`5052`	`}`
	`5053`	`+`
	`5054`	`+ .admin__control-table-wrapper {`
	`5055`	`+ clear: both;`
	`5056`	`+ }`
`5052`	`5057`	`}`
`5053`	`5058`
`5054`	`5059`	`.catalog-product-set-index {`