Merge branch 'release/2.10.0'

SnowdogApps · Oct 21, 2020 · e191646 · e191646 · vercel · Oct 21, 2020
2 parents 20080a8 + c69b085
commit e191646
Show file tree

Hide file tree

Showing 117 changed files with 3,662 additions and 578 deletions.
diff --git a/Amasty_Gdpr/templates/settings.phtml b/Amasty_Gdpr/templates/settings.phtml
@@ -33,7 +33,13 @@ $settings = $block->getPrivacySettings();
                     <?= $block->escapeHtml($setting['content']) ?>
                 </p>
                 <?php if ($setting['hasCheckbox']): ?>
-                    <div class="checkbox margin-bottom-m">
+                    <div
+                        class="
+                            checkbox
+                            margin-bottom-m
+                            required
+                        "
+                    >
                         <input
                             type="checkbox"
                             id="agree-<?= $block->escapeHtmlAttr($setting['actionCode']) ?>"

diff --git a/AuthorizeNet_CreditCard/web/template/payment/form.html b/AuthorizeNet_CreditCard/web/template/payment/form.html
@@ -356,10 +356,10 @@
                         <use data-bind="attr: { 'xlink:href': require.toUrl('images/icons-sprite.svg#unchecked') }" xlink:href=''></use>
                     </svg>
                     <label
-                        class="checkbox__label"
+                        class="checkbox__label label"
                         data-bind="attr: {'for': getCode() + '_enable_vault'}"
                     >
-                        <span>
+                        <span class="checkbox__text">
                             <!-- ko i18n: 'Save for later use.'--><!-- /ko -->
                         </span>
                     </label>

diff --git a/AuthorizeNet_PayPalExpress/templates/button.phtml b/AuthorizeNet_PayPalExpress/templates/button.phtml
@@ -0,0 +1,16 @@
+<?php
+/* @var \AuthorizeNet\PayPalExpress\Block\Button $block */
+?>
+
+<div
+    class="
+        paypal-express-checkout
+        width-full
+        margin-bottom-m
+    "
+    id="<?= $block->escapeHtmlAttr($block->getShortcutHtmlId()) ?>"
+    data-mage-init='{
+        "AuthorizeNet_PayPalExpress/js/view/button": <?= /* @noEscape */ $block->getJsonConfig() ?>
+    }'
+>
+</div>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,12 +3,48 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [Released]
+## [2.10.0] - 2020-10-21
+
+### Added
+- full with variant styles to slider (#69023)
+
 ### Fixed
+- issue with arrows looking wrong if gallery vertical/horizontal nav breakpoints are changed via configuration (#71113); Affects: gallery navigation
+- input and select styles in poduct gift card template (#70690); Affects: gift card PDP
+- review snippets (#69786)
+- tooltip text align on product list (#71074)
+- amasty gdpr cookie modal on checkout (#71134)
+- a translate function `__()` syntax error in wishlist item column cart template (#71267)
+- jumping images: in products grid & list on catalog, in widgets, in banners and cms images (#69133);
+  Affects: cms blocks width images (homepage), catalog grid and list (products images & category image), products widgets, banners (CT), blog, sliders;
+  required: import scss file: `_image-ratio.scss`, additional fields in banner content type
+- paypal express button (#71512)
+- division by zero warning (#71513)
+- AuthorizeNet 'Save for later use' checkbox styling in checkout (#71077)
+- swatch images on product page (#71579); Affects: swatch images
+- gallery rendering on page load so current breakpoint configuration isn't replaced by any other configuration (fix from Magento 2.4-develop PR 29934) (#71518)
+- a11y in header, footer & homepage: fieldset & legend, inputs wrong ids, keyboard support, focus management, sidebar menu, aria roles, semantic HTML (#66038)
+- loader scope for in swatches (#71300)
+- error on company profle page (#72234)
+- tab content in quote view - removed escaping (#72243)
 ### Added
+- adjust sliders loading time + add slider widget template (#65842)
+- scroll-to.js file and added it for reviews on product page (#71248); Affects: Reviews buttons on PDP
+- variables for footer bottom bar (#71488)
+- downloadable product PDP (#70550)
+- wishlist - config items - show "see details" with selected options (#71268); Affects: wishlist in dashboard
+- loader for picture element (#71300)
+- swatch variables (#71396), Affects: swatches on catalog
+- base.scss variables (#71396)
+- variables for product-view, review and tab (#71110);
+- pager to wishlist (#71692)
 ### Changed
 ### Removed
+- unnecessary title from svgs with role presentation (#71268)
+- reference to Magento\Rma\Block\Order\Button block on OS (#71741); Affects: order view, order invoice & order shipment
+
 
-## [Released]
 
 ## [2.9.0] - 2020-09-21
 ### Fixed

diff --git a/Magento_Catalog/layout/catalog_category_view.xml b/Magento_Catalog/layout/catalog_category_view.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0"?>
-<page 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    layout="2columns-left" 
+<page
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    layout="2columns-left"
     xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
 >
     <body>
+        <referenceBlock name="category.image">
+            <arguments>
+                <argument name="category_image_view_model" xsi:type="object">Snowdog\CategoryAttributes\ViewModel\ImageSize</argument>
+            </arguments>
+        </referenceBlock>
         <referenceBlock name="category.product.addto">
             <referenceBlock name="category.product.addto.wishlist">
                 <arguments>

diff --git a/Magento_Catalog/layout/catalog_product_view.xml b/Magento_Catalog/layout/catalog_product_view.xml
@@ -86,7 +86,7 @@
                     <referenceBlock name="product.info">
                         <container
                             name="product.column.right.options"
-                            htmlClass="product-view__options"
+                            htmlClass="product-view__options margin-bottom-m"
                             htmlTag="div"
                         />
 
@@ -117,7 +117,7 @@
                                     />
                                 </container>
                             </block>
-                            
+
                             <container name="product.addto.sticky">
                                 <block
                                     class="Magento\Catalog\Block\Product\View"
@@ -254,6 +254,10 @@
                 htmlTag="div"
             >
                 <referenceBlock name="reviews.tab">
+                    <arguments>
+                        <argument name="class" translate="true" xsi:type="string">reviews</argument>
+                    </arguments>
+
                     <block
                         class="Magento\Catalog\Block\Product\View"
                         name="product.review.summary"
@@ -293,9 +297,9 @@
                     name="additional_class"
                     xsi:type="string"
                 >
-                    action 
-                    towishlist 
-                    product-view__button--wishlist 
+                    action
+                    towishlist
+                    product-view__button--wishlist
                     product-view__addtowishlist
                 </argument>
                 <argument
@@ -543,13 +547,13 @@
         />
 
         <!-- Removed blocks -->
-        <referenceBlock 
-            name="product.info.addto" 
-            remove="true" 
+        <referenceBlock
+            name="product.info.addto"
+            remove="true"
         />
-        <referenceBlock 
-            name="product.info.addtocart.additional" 
-            remove="true" 
+        <referenceBlock
+            name="product.info.addtocart.additional"
+            remove="true"
         />
     </body>
 </page>
diff --git a/Magento_Catalog/styles/modules/_fotorama.scss b/Magento_Catalog/styles/modules/_fotorama.scss
@@ -48,12 +48,15 @@
                         }
                     }
                 }
+            }
+        }
 
+        &--horizontal {
+            .fotorama__thumb__arr {
                 &--left,
                 &--right {
                     .fotorama__thumb--icon {
                         @extend .gallery__icon-arrow;
-                        @extend .gallery__icon-arrow--vertical;
 
                         position: relative;
                         height: 24px;
@@ -71,6 +74,24 @@
             .fotorama__nav__frame--thumb {
                 @extend .gallery__thumb--vertical;
             }
+
+            .fotorama__thumb__arr {
+                &--left,
+                &--right {
+                    .fotorama__thumb--icon {
+                        @extend .gallery__icon-arrow;
+                        @extend .gallery__icon-arrow--vertical;
+
+                        position: relative;
+                        height: 24px;
+                        width: 24px;
+                        padding: 0;
+                        margin: auto;
+                        background-position: center;
+                        fill: $gallery__icon-arrow-color;
+                    }
+                }
+            }
         }
 
         .fotorama__nav--thumbs {

diff --git a/Magento_Catalog/templates/category/image.phtml b/Magento_Catalog/templates/category/image.phtml
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Category view template
+ *
+ * @var $block \Magento\Catalog\Block\Category\View
+ */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable Generic.WhiteSpace.ScopeIndent.IncorrectExact
+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
+?>
+<?php
+    /** @var \Snowdog\CategoryAttributes\ViewModel\ImageSize $categoryImageViewModel */
+    $categoryImageViewModel = $block->getCategoryImageViewModel();
+    $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
+    $_category = $block->getCurrentCategory();
+    $_imgHtml = '';
+    if ($_imgUrl = $_category->getImageUrl()) {
+        $imgSize = $categoryImageViewModel->get($_category);
+        $imgWidth = $imgSize['width'];
+        $imgHeight = $imgSize['height'];
+        $aspectRatio = $imgHeight && $imgWidth ? ($imgHeight / $imgWidth) * 100 : 0;
+        $aspectRatioClass = $aspectRatio > 0 ? 'ratio-container' : '';
+        $_imgHtml = '
+            <div
+                class="
+                    category-image
+                    '. $aspectRatioClass .'
+                "
+                style="padding-bottom:' . $aspectRatio . '%"
+            >
+                <img
+                    src="' . $block->escapeUrl($_imgUrl) . '"
+                    alt="' . $block->escapeHtmlAttr($_category->getName()) . '"
+                    title="' . $block->escapeHtmlAttr($_category->getName()) . '"
+                    class="
+                        image
+                        lazyload
+                        ratio-image
+                    "
+                />
+            </div>
+        ';
+        $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
+        /* @noEscape */ echo $_imgHtml;
+    }
+?>
diff --git a/Magento_Catalog/templates/product/image_with_borders.phtml b/Magento_Catalog/templates/product/image_with_borders.phtml
@@ -1,10 +1,17 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
-<div class="lazyload-wrapper">
+<div 
+    class="
+        lazyload-wrapper 
+        ratio-container
+    "
+    style="padding-bottom: <?= ($block->getRatio() * 100) ?>%;"
+>
     <img
         class="
             image
             product-image-photo
+            ratio-image
             lazyload
         "
         src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAABCAQAAABN/Pf1AAAAC0lEQVR42mNkwAIAACoAAgu1Hc4AAAAASUVORK5CYII="

diff --git a/Magento_Catalog/templates/product/list/items.phtml b/Magento_Catalog/templates/product/list/items.phtml
@@ -244,7 +244,6 @@ $sliderResponsiveConfig = '[
                             product-item-info
                             product-grid-item--slider-item
                         "
-                        tabindex="0"
                     >
                         <?= '<!-- ' . $image . '-->' ?>
                         <a
@@ -321,7 +320,7 @@ $sliderResponsiveConfig = '[
                                     <?= $block->getProductPrice($_item) ?>
                                 </div>
                                 <?php if ($showAddTo || $showCart): ?>
-                                    <div 
+                                    <div
                                         class="
                                             product-grid-item__actions
                                             <?= ($productMetadata->getEdition() == 'B2B') ? 'product-grid-item__actions--ee' : '' ?>

diff --git a/Magento_Catalog/templates/product/view/options/type/text.phtml b/Magento_Catalog/templates/product/view/options/type/text.phtml
@@ -5,15 +5,16 @@ $_optionId = $_option->getId();
 $class = ($_option->getIsRequire()) ? ' required' : '';
 $isTextarea = \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA;
 $isTextField = \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD;
+$maxCharacters = $_option->getMaxCharacters();
 
 $_textValidate = null;
 
 if ($_option->getIsRequire()) {
     $_textValidate['required'] = true;
 }
 
-if ($_option->getMaxCharacters()) {
-    $_textValidate['maxlength'] = $_option->getMaxCharacters();
+if ($maxCharacters) {
+    $_textValidate['maxlength'] = $maxCharacters;
 }
 ?>
 
@@ -63,12 +64,12 @@ if ($_option->getMaxCharacters()) {
             ><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif; ?>
 
-        <?php if ($_option->getMaxCharacters()): ?>
+        <?php if ($maxCharacters): ?>
             <p class="note note_<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-                <?= $block->escapeHtml(__('Maximum %1 characters', $_option->getMaxCharacters())) ?>
+                <?= $block->escapeHtml(__('Maximum %1 characters', $maxCharacters)) ?>
 
                 <strong class="character-counter no-display">
-                    <?= $_option->getMaxCharacters() ?>
+                    <?= $maxCharacters ?>
                 </strong>
             </p>
         <?php endif; ?>

diff --git a/Magento_Catalog/templates/product/widget/viewed/grid.phtml b/Magento_Catalog/templates/product/widget/viewed/grid.phtml
@@ -32,7 +32,7 @@
         //slider config
         $sliderIsAjax           = true;
         $sliderArrows           = true;
-        $sliderClass            = 'slider--products';
+        $sliderClass            = 'slider--products slider--nested';
         $sliderInfinite         = 'no';
         $sliderSlidesToShow     = '2';
         $sliderSlidesToScroll   = '1';

diff --git a/Magento_Catalog/templates/product/widget/viewed/list.phtml b/Magento_Catalog/templates/product/widget/viewed/list.phtml
@@ -34,7 +34,7 @@
         //slider config
         $sliderIsAjax           = true;
         $sliderArrows           = true;
-        $sliderClass            = 'slider--products';
+        $sliderClass            = 'slider--products slider--nested';
         $sliderInfinite         = 'no';
         $sliderSlidesToShow     = '2';
         $sliderSlidesToScroll   = '1';

diff --git a/Magento_CatalogWidget/templates/product/widget/content/grid.phtml b/Magento_CatalogWidget/templates/product/widget/content/grid.phtml
@@ -50,7 +50,6 @@ use Magento\Framework\App\Action\Action;
                     heading--first-level
                     margin-0
                 "
-                id="widget-product-grid-title"
             >
                 <?= $block->escapeHtml(__($block->getTitle())) ?>
             </h2>
@@ -91,7 +90,6 @@ use Magento\Framework\App\Action\Action;
                         product-grid-item--slider-item
                         product-item-info
                     "
-                    tabindex="0"
                 >
                     <a
                         href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
@@ -242,11 +240,13 @@ use Magento\Framework\App\Action\Action;
                                                         type="hidden"
                                                         name="product"
                                                         value="<?= $block->escapeHtmlAttr($postParams['data']['product']) ?>"
+                                                        tabindex="-1"
                                                     />
                                                     <input
                                                         type="hidden"
-                                                        name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
-                                                        value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>"
+                                                        name="<?= Action::PARAM_NAME_URL_ENCODED ?>"
+                                                        value="<?= $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>"
+                                                        tabindex="-1"
                                                     />
                                                     <?= $block->getBlockHtml('formkey') ?>
                                                     <button

diff --git a/Magento_Checkout/web/template/shipping.html b/Magento_Checkout/web/template/shipping.html
@@ -146,6 +146,7 @@
                                 action
                                 continue
                                 primary
+                                margin-right-xs
                             "
                         >
                             <span translate="'Next'"></span>