🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests: - #21320: [Backport][Ui] Fixing the changing state of dropdown's icon (by @eduard13) - #21229: [Backport] Fixed product advanced pricing design issue (by @mage2pratik) - #21173: [Backport] fixes-customer-information-wishlist-configurable-product-alignment-2.2 (by @amol2jcommerce) - #20370: iPhone5-device-newsletter-subscription-#20167 (by @dipti2jcommerce) Fixed GitHub Issues: - #21196: [UI] The dropdown state doesn't change if the dropdown is expanded or not (reported by @eduard13) has been fixed in #21320 by @eduard13 in 2.2-develop branch Related commits: 1. 1e4055d - #18775: Product Advanced Pricing design issue (reported by @saphaljha) has been fixed in #21229 by @mage2pratik in 2.2-develop branch Related commits: 1. 079d5d5 - #20760: Admin Customer configuraion in whishlist associated product for configurable product misalign (reported by @nainesh2jcommerce) has been fixed in #21173 by @amol2jcommerce in 2.2-develop branch Related commits: 1. e9102ec 2. 17d416a 3. 5d42fa8 - #20163: On iPhone5 device newsletter subscription input box not contain complete text (placeholder) (reported by @dipti2jcommerce) has been fixed in #20370 by @dipti2jcommerce in 2.2-develop branch Related commits: 1. c874bf5 2. 9f1a322
magento · Feb 19, 2019 · 88ad7a6 · 88ad7a6
2 parents 6d856c4 + e3e888d
commit 88ad7a6
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 14 deletions.
diff --git a/...bleProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/...bleProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -17,9 +17,9 @@
     <legend class="legend admin__legend">
         <span><?= /* @escapeNotVerified */ __('Associated Products') ?></span>
     </legend>
-    <div class="product-options">
-        <div class="field admin__field _required required">
-            <?php foreach ($_attributes as $_attribute): ?>
+    <div class="product-options fieldset admin__fieldset">
+        <?php foreach ($_attributes as $_attribute): ?>
+            <div class="field admin__field _required required">
                 <label class="label admin__field-label"><?php
                     /* @escapeNotVerified */ echo $_attribute->getProductAttribute()
                         ->getStoreLabel($_product->getStoreId());
@@ -34,8 +34,8 @@
                         <option><?= /* @escapeNotVerified */ __('Choose an Option...') ?></option>
                     </select>
                 </div>
-            <?php endforeach; ?>
-        </div>
+            </div>
+        <?php endforeach; ?>
     </div>
 </fieldset>
 <script>

diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
@@ -9,8 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormConfigureProductSection">
-        <element name="optionSelect" type="select" selector="//div[@class='product-options']/div/div/select[../../label[text() = '{{option}}']]" parameterized="true"/>
+        <element name="optionSelect" type="select" selector="//div[contains(@class, 'product-options')]//div//label[.='{{option}}']//following-sibling::*//select" parameterized="true"/>
         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
         <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
     </section>
-</sections>
+</sections>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -8,8 +8,8 @@
      visible="visible"
      css="$data.additionalClasses"
      attr="'data-index': index">
-    <div class="admin__field-label">
-        <label if="$data.label" visible="$data.labelVisible"  attr="for: uid">
+    <div class="admin__field-label" visible="$data.labelVisible">
+        <label if="$data.label"  attr="for: uid">
             <span translate="label" attr="'data-config-scope': $data.scopeLabel" />
         </label>
     </div>

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html
@@ -19,7 +19,7 @@
                 css: {
                     _selected: $parent.root.isSelected(option.value),
                     _hover: $parent.root.isHovered(option, $element),
-                    _expended: $parent.root.getLevelVisibility($data),
+                    _expended: $parent.root.getLevelVisibility($data) || $data.visible,
                     _unclickable: $parent.root.isLabelDecoration($data),
                     _last: $parent.root.addLastElement($data),
                     '_with-checkbox': $parent.root.showCheckbox

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
@@ -125,12 +125,13 @@
                         css: {
                             _selected: $parent.isSelected(option.value),
                             _hover: $parent.isHovered(option, $element),
-                            _expended: $parent.getLevelVisibility($data),
+                            _expended: $parent.getLevelVisibility($data) && $parent.showLevels($data),
                             _unclickable: $parent.isLabelDecoration($data),
                             _last: $parent.addLastElement($data),
                             '_with-checkbox': $parent.showCheckbox
                         },
                         click: function(data, event){
+                            $parent.showLevels($data);
                             $parent.toggleOptionSelected($data, $index(), event);
                         },
                         clickBubble: false

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
@@ -330,7 +330,7 @@
             border-top: @action-multiselect-tree-lines;
             height: 1px;
             top: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
-            width: @action-multiselect-tree-menu-item__margin-left + @action-multiselect-menu-item__padding;
+            width: @action-multiselect-tree-menu-item__margin-left;
         }
 
         //  Vertical dotted line

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -527,7 +527,6 @@
 
             & > .admin__field-label {
                 #mix-grid .column(@field-label-grid__column, @field-grid__columns);
-                background: @color-white;
                 cursor: pointer;
                 left: 0;
                 position: absolute;

diff --git a/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less
@@ -81,3 +81,24 @@
         width: 34%;
     }
 }
+
+//
+//  Mobile
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .block {
+        &.newsletter {
+            input {
+                font-size: 12px;
+                padding-left: 30px;
+            }
+
+            .field {
+                .control:before {
+                    font-size: 13px;
+                }
+            }
+        }
+    }
+}
diff --git a/...ests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml b/...ests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
@@ -9,7 +9,7 @@
     <fields>
         <qty />
         <attribute>
-            <selector>//div[@class="product-options"]//label[.="%s"]//following-sibling::*//select</selector>
+            <selector>//div[contains(@class, "product-options")]//div//label[.="%s"]//following-sibling::*//select</selector>
             <strategy>xpath</strategy>
             <input>select</input>
         </attribute>