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
index d8a0a53805199f79e4a7466a24e6144fc6919f8a..2ead1ffd35b50ff37c623473a0374f72ddc4168c 100644
--- 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
index bc1ff742ac260798b03a25f515fa471b4bc23f02..870304c881627b4ea774581536e156cbd3ca5e95 100644
--- 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
index 08b20d4b856064e3228947c346d379d0b41a3d49..d97629631556698a58c7467b9196b571f435b8ac 100644
--- 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
index a223c1cd54384ac66e6fcd5c39188484b994093c..5dab5c390e8dea9a58e14d00ca67a12210480c25 100644
--- 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
index 0ee301d3eaaea26cbe8d8114d9202f246cffbb01..a3dc49b8f7751613283389385a72023df9b92c99 100644
--- 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
index d2ec80878701c8945c0d21056dc1ac6b7987a76c..0ff69426c5b9a010e620aaf00373c179cebfbb1e 100644
--- 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
index 36762d541cb5c4eab584ba4ea45f36bc612979fe..b0c64d9eff64075dc04b6bdb3ac5bc4e4ac61240 100644
--- 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
index 2d6a45c13ad9e71ee3e73b046d64eba880ff2cd5..b94286db3c299077c05b40370e8a82f36bb270c4 100644
--- 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
index ad90855a48326f21a2c54890922d74a71eb8e88e..8c8c43b3420988f49639bbf30e3d9f8947265a50 100644
--- 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
index 77a4fe57578ffed99401d9d175a8faa2a75011af..887313b6d4e8466d12c94082f8c8753b43b683a6 100644
--- 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
index 77a494af49678588c5eac81af08e8564a8306797..a0b8996eec82a67dd237f6905e7f633b9b7c92e6 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
@@ -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;
- }
}
\ No newline at end of file
diff --git a/lib/web/mage/dropdowns.js b/lib/web/mage/dropdowns.js
index bb5a35fe144db14d7c7e44a41fb6b8f38248795e..6730c6cff7fe3015fc3f7b2094e1271589f75055 100644
--- 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);