diff --git a/Amasty_Gdpr/templates/settings.phtml b/Amasty_Gdpr/templates/settings.phtml index 8b6c04304..65810b68c 100644 --- a/Amasty_Gdpr/templates/settings.phtml +++ b/Amasty_Gdpr/templates/settings.phtml @@ -33,7 +33,13 @@ $settings = $block->getPrivacySettings(); escapeHtml($setting['content']) ?>

-
+
diff --git a/AuthorizeNet_PayPalExpress/templates/button.phtml b/AuthorizeNet_PayPalExpress/templates/button.phtml new file mode 100644 index 000000000..7ce81eb30 --- /dev/null +++ b/AuthorizeNet_PayPalExpress/templates/button.phtml @@ -0,0 +1,16 @@ + + +
+
diff --git a/CHANGELOG.md b/CHANGELOG.md index e46f52ff1..8b44fc056 100644 --- 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 index b83c7c341..ab5b15e42 100644 --- a/Magento_Catalog/layout/catalog_category_view.xml +++ b/Magento_Catalog/layout/catalog_category_view.xml @@ -1,10 +1,15 @@ - + + + Snowdog\CategoryAttributes\ViewModel\ImageSize + + diff --git a/Magento_Catalog/layout/catalog_product_view.xml b/Magento_Catalog/layout/catalog_product_view.xml index e15c5cf3d..da45624b8 100644 --- a/Magento_Catalog/layout/catalog_product_view.xml +++ b/Magento_Catalog/layout/catalog_product_view.xml @@ -86,7 +86,7 @@ @@ -117,7 +117,7 @@ /> - + + + reviews + + - action - towishlist - product-view__button--wishlist + action + towishlist + product-view__button--wishlist product-view__addtowishlist - - diff --git a/Magento_Catalog/styles/modules/_fotorama.scss b/Magento_Catalog/styles/modules/_fotorama.scss index 98604d9c9..9a6b7ea4e 100644 --- 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 new file mode 100644 index 000000000..8490ee7bd --- /dev/null +++ b/Magento_Catalog/templates/category/image.phtml @@ -0,0 +1,47 @@ + +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 = ' +
+ ' . $block->escapeHtmlAttr($_category->getName()) . ' +
+ '; + $_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 index b3bf2fd1a..6a964e822 100644 --- a/Magento_Catalog/templates/product/image_with_borders.phtml +++ b/Magento_Catalog/templates/product/image_with_borders.phtml @@ -1,10 +1,17 @@ -
+
' ?> diff --git a/Magento_Catalog/templates/product/view/options/type/text.phtml b/Magento_Catalog/templates/product/view/options/type/text.phtml index 75a3e1147..0cfb1b044 100644 --- a/Magento_Catalog/templates/product/view/options/type/text.phtml +++ b/Magento_Catalog/templates/product/view/options/type/text.phtml @@ -5,6 +5,7 @@ $_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; @@ -12,8 +13,8 @@ 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()) { >escapeHtml($block->getDefaultValue()) ?> - getMaxCharacters()): ?> +

- escapeHtml(__('Maximum %1 characters', $_option->getMaxCharacters())) ?> + escapeHtml(__('Maximum %1 characters', $maxCharacters)) ?> - getMaxCharacters() ?> +

diff --git a/Magento_Catalog/templates/product/widget/viewed/grid.phtml b/Magento_Catalog/templates/product/widget/viewed/grid.phtml index 5e23ba34a..12e89d887 100644 --- 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 index 8329d78a5..7f707c281 100644 --- 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 index 819a5b221..831ae5afb 100644 --- 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" > escapeHtml(__($block->getTitle())) ?> @@ -91,7 +90,6 @@ use Magento\Framework\App\Action\Action; product-grid-item--slider-item product-item-info " - tabindex="0" > getBlockHtml('formkey') ?>
-
- - -
-
- - -
- +
diff --git a/Magento_Customer/templates/form/confirmation.phtml b/Magento_Customer/templates/form/confirmation.phtml index 02d82a078..08df51747 100644 --- a/Magento_Customer/templates/form/confirmation.phtml +++ b/Magento_Customer/templates/form/confirmation.phtml @@ -16,7 +16,12 @@ class="fieldset account-form__fieldset" data-hasrequired="escapeHtmlAttr(__('* Required Fields')) ?>" > - + escapeHtml(__('Email')) ?>
getBlockHtml('formkey'); ?>