[EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit af23bf4473d8 · 2018-08-20T13:51:21.000+03:00
- merged latest code from mainline branch
diff --git a/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php b/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
diff --git a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
diff --git a/app/code/Magento/Search/etc/di.xml b/app/code/Magento/Search/etc/di.xml
@@ -82,7 +82,4 @@
             <argument name="dataStorage" xsi:type="object">Magento\Search\Model\SearchEngine\Config\Data</argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\Model\Menu\Builder">
-        <plugin name="SearchTermMenuBuilder" type="Magento\Search\Model\SearchEngine\MenuBuilder" />
-    </type>
 </config>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
@@ -11,7 +11,7 @@
 <?php if ($block->isAllowInCart() && $block->isProductVisibleInSiteVisibility()): ?>
     <a href="#"
        data-post='<?= /* @noEscape */ $block->getMoveFromCartParams() ?>'
-       class="use-ajax action action-towishlist">
+       class="use-ajax action towishlist action-towishlist">
         <span><?= $block->escapeHtml(__('Move to Wishlist')) ?></span>
     </a>
 <?php endif ?>
diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -60,8 +60,8 @@
     }
 
     .gift-summary {
-        position: relative;
         margin-top: @indent__s;
+        position: relative;
 
         .actions-toolbar {
             > .secondary {
@@ -328,7 +328,7 @@
     }
 
     .gift-options-cart-item {
-        & + .action-towishlist {
+        & + .towishlist {
             left: 43px;
             position: absolute;
         }
diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
@@ -40,6 +40,17 @@
             .items {
                 padding: 6px 0;
                 text-align: left;
+                > .item {
+                    span {
+                        display: block;
+                    }
+
+                    &:last-child {
+                        span {
+                            display: inline;
+                        }
+                    }
+                }
             }
 
             > .action {
@@ -378,6 +389,16 @@
                                 .lib-css(background, @collapsible-nav-item-hover);
                             }
                         }
+
+                        span {
+                            display: block;
+                        }
+
+                        &:last-child {
+                            span {
+                                display: inline;
+                            }
+                        }
                     }
                 }
             }
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -267,7 +267,7 @@
     }
 
     .cart.table-wrapper {
-        .action-towishlist {
+        .towishlist {
             .lib-icon-font(
             @icon-wishlist-full,
             @_icon-font-size: 18px,
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
@@ -40,7 +40,7 @@ class CartItem extends AbstractCartItem
      *
      * @var string
      */
-    protected $wishlistButton = '.action-towishlist';
+    protected $wishlistButton = '.towishlist';
 
     /**
      * Quantity input selector

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`.gift-summary {`
`63`		`- position: relative;`
`64`	`63`	`margin-top: @indent__s;`
	`64`	`+ position: relative;`
`65`	`65`
`66`	`66`	`.actions-toolbar {`
`67`	`67`	`> .secondary {`
`@@ -328,7 +328,7 @@`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`.gift-options-cart-item {`
`331`		`- & + .action-towishlist {`
	`331`	`+ & + .towishlist {`
`332`	`332`	`left: 43px;`
`333`	`333`	`position: absolute;`
`334`	`334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,17 @@`
`40`	`40`	`.items {`
`41`	`41`	`padding: 6px 0;`
`42`	`42`	`text-align: left;`
	`43`	`+ > .item {`
	`44`	`+ span {`
	`45`	`+ display: block;`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ &:last-child {`
	`49`	`+ span {`
	`50`	`+ display: inline;`
	`51`	`+ }`
	`52`	`+ }`
	`53`	`+ }`
`43`	`54`	`}`
`44`	`55`
`45`	`56`	`> .action {`
`@@ -378,6 +389,16 @@`
`378`	`389`	`.lib-css(background, @collapsible-nav-item-hover);`
`379`	`390`	`}`
`380`	`391`	`}`
	`392`	`+`
	`393`	`+ span {`
	`394`	`+ display: block;`
	`395`	`+ }`
	`396`	`+`
	`397`	`+ &:last-child {`
	`398`	`+ span {`
	`399`	`+ display: inline;`
	`400`	`+ }`
	`401`	`+ }`
`381`	`402`	`}`
`382`	`403`	`}`
`383`	`404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`.cart.table-wrapper {`
`270`		`- .action-towishlist {`
	`270`	`+ .towishlist {`
`271`	`271`	`.lib-icon-font(`
`272`	`272`	`@icon-wishlist-full,`
`273`	`273`	`@_icon-font-size: 18px,`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class CartItem extends AbstractCartItem`
`40`	`40`	`*`
`41`	`41`	`* @var string`
`42`	`42`	`*/`
`43`		`- protected $wishlistButton = '.action-towishlist';`
	`43`	`+ protected $wishlistButton = '.towishlist';`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Quantity input selector`