Merge remote-tracking branch 'mainline/develop' into BUGS

slavvka · slavvka · commit 3f29e6f932e5 · 2016-04-08T11:10:35.000+03:00
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -552,6 +552,7 @@
                     <item name="required" xsi:type="boolean">false</item>
                     <item name="sortOrder" xsi:type="number">220</item>
                     <item name="breakLine" xsi:type="boolean">false</item>
+                    <item name="scopeLabel" xsi:type="string">[STORE VIEW]</item>
                     <item name="imports" xsi:type="array">
                         <item name="disabled" xsi:type="string">ns = ${ $.ns }, index = custom_use_parent_settings :checked</item>
                     </item>
@@ -564,6 +565,7 @@
                         <item name="sortOrder" xsi:type="number">230</item>
                         <item name="dataType" xsi:type="string">string</item>
                         <item name="formElement" xsi:type="string">date</item>
+                        <item name="scopeLabel" xsi:type="string"/>
                         <item name="imports" xsi:type="array">
                             <item name="disabled" xsi:type="string">ns = ${ $.ns }, index = custom_use_parent_settings :checked</item>
                         </item>
@@ -578,6 +580,7 @@
                         <item name="dataType" xsi:type="string">string</item>
                         <item name="label" xsi:type="string" translate="true">To</item>
                         <item name="formElement" xsi:type="string">date</item>
+                        <item name="scopeLabel" xsi:type="string"/>
                         <item name="imports" xsi:type="array">
                             <item name="disabled" xsi:type="string">ns = ${ $.ns }, index = custom_use_parent_settings :checked</item>
                         </item>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml
@@ -158,6 +158,7 @@
                             <item name="prefer" xsi:type="string">radio</item>
                             <item name="sortOrder" xsi:type="string">0</item>
                             <item name="columnsHeaderClasses" xsi:type="string">control-table-options-th</item>
+                            <item name="additionalClasses" xsi:type="string">control-table-options-cell</item>
                             <item name="modules" xsi:type="array">
                                 <item name="rows" xsi:type="string">ns = ${ $.ns }, index = attribute_options_select</item>
                             </item>
@@ -229,6 +230,7 @@
                             <item name="value" xsi:type="string">1</item>
                             <item name="sortOrder" xsi:type="string">0</item>
                             <item name="columnsHeaderClasses" xsi:type="string">control-table-options-th</item>
+                            <item name="additionalClasses" xsi:type="string">control-table-options-cell</item>
                             <item name="modules" xsi:type="array">
                                 <item name="rows" xsi:type="string">ns = ${ $.ns }, index = attribute_options_multiselect</item>
                             </item>
diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml
@@ -105,6 +105,7 @@
                             <item name="prefer" xsi:type="string">radio</item>
                             <item name="sortOrder" xsi:type="string">0</item>
                             <item name="columnsHeaderClasses" xsi:type="string">control-table-options-th</item>
+                            <item name="additionalClasses" xsi:type="string">control-table-options-cell</item>
                         </item>
                     </argument>
                 </field>
@@ -246,6 +247,7 @@
                             <item name="prefer" xsi:type="string">radio</item>
                             <item name="sortOrder" xsi:type="string">0</item>
                             <item name="columnsHeaderClasses" xsi:type="string">control-table-options-th</item>
+                            <item name="additionalClasses" xsi:type="string">control-table-options-cell</item>
                         </item>
                     </argument>
                 </field>
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html
@@ -15,7 +15,7 @@
             <thead if="element.columnsHeader">
             <tr data-bind="foreach: {data: labels, as: 'label'}">
                 <th text="label.config.label"
-                    css="$parent.setClasses(label.config)">
+                    css="item.columnsHeaderClasses">
                 </th>
             </tr>
             </thead>
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
@@ -18,9 +18,9 @@
 
                     <!-- ko foreach: {data: labels, as: 'item'}  -->
                     <th text="item.label"
-                        css="$parent.setClasses(item)"
+                        css="item.columnsHeaderClasses"
                         visible="item.visible"
-                        disabled="item.disabled"
+                        disable="item.disabled"
                         attr="{'data-name': name}"/>
                     <!-- /ko -->
                 </tr>
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
@@ -26,7 +26,7 @@
                         text="item.label"
                         visible="item.visible"
                         disable="item.disabled"
-                        css="$parent.setClasses(item)">
+                        css="item.columnsHeaderClasses">
                     </th>
                     <!-- /ko -->
                 </tr>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less
@@ -226,7 +226,7 @@
 .limited-text {
     display: inline-block;
     line-height: 1.4em;
-    max-height: 2.4em; // Exactly 3 lines
+    max-height: 4.4em; // Exactly 3 lines
     overflow: hidden;
     position: relative;
     vertical-align: top;
@@ -254,7 +254,7 @@
         -webkit-line-clamp: 3;
         display: -webkit-box;
         height: auto;
-        max-height: 3.6em; // Is needed to get it work
+        max-height: 4.4em; // Is needed to get it work
 
         &:after {
             display: none;
@@ -314,6 +314,7 @@
     .schedule-summary-name,
     .schedule-summary-date {
         display: table-cell;
+        padding-right: .5rem;
     }
 
     .schedule-summary-name {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
@@ -71,6 +71,7 @@
     cursor: pointer;
     float: left;
     font-size: @staging-preview-header__font-size;
+    min-height: 8.5rem;
     padding: 1.5rem @indent__xl @indent__m;
     position: relative;
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -113,6 +113,7 @@
             min-width: @field-size__m;
             right: auto;
             top: auto;
+            z-index: 1;
         }
     }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_data-tooltip.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_data-tooltip.less
@@ -25,6 +25,7 @@
 }
 
 .data-tooltip-wrapper {
+    max-width: 75%;
     position: absolute;
     top: 0;
     z-index: @data-tooltip__z-index;
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
@@ -138,6 +138,10 @@
         width: 10rem;
     }
 
+    .control-table-options-cell {
+        text-align: center;
+    }
+
     //  Static text in row
     .control-table-text {
         line-height: 3.2rem;
@@ -204,8 +208,4 @@
             padding: 0;
         }
     }
-
-    .admin__field-option {
-        text-align: center;
-    }
 }
diff --git a/lib/web/mage/dropdowns.js b/lib/web/mage/dropdowns.js
@@ -106,7 +106,11 @@ define([
 
             elem.on('click.toggleDropdown', function() {
                 if(options.autoclose === true) {
-                    self.reset({elems: actionElem.not(elem)});
+                    var elem = actionElem;
+
+                    actionElem = $();
+                    $(document).trigger('click.hideDropdown');
+                    actionElem = elem;
                 }
                 self[elem.hasClass(options.activeClass) ? 'closeDropdown' : 'openDropdown'](elem);
 

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@`
`113`	`113`	`min-width: @field-size__m;`
`114`	`114`	`right: auto;`
`115`	`115`	`top: auto;`
	`116`	`+ z-index: 1;`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`.data-tooltip-wrapper {`
	`28`	`+ max-width: 75%;`
`28`	`29`	`position: absolute;`
`29`	`30`	`top: 0;`
`30`	`31`	`z-index: @data-tooltip__z-index;`