From c5ba94b19e6ffe804ad0c2ebe1d03257df0f1ba7 Mon Sep 17 00:00:00 2001 From: Ludo Date: Fri, 23 Feb 2024 13:39:21 -0400 Subject: [PATCH] Pull in latest release 13.0.1 (#3292) * Fix translation path (#3198) * Change product variant swatches' border color (#3204) * change color reference * remove character * increase to meet contrast ratio of 3 * Update swatch setting info text (#3205) * Update info text * remove duplication * add space * clean up language and association * add to second place * Update 9 translation files * Update 4 translation files * Update 6 translation files * Update 1 translation file --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Quick order list] Change 'plural' string to 'singular' when removing '1 item' on 'Remove all' confirmation (#3203) * Change the message when removing only one item from the QOL * Update 20 translation files * Update 6 translation files * Update 4 translation files --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Fix drawer stylings (#3248) * Update 1 translation file (#3202) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Pull update from release branch and update version number and release notes (#3229) * Fix translation path (#3198) * Change product variant swatches' border color (#3204) * change color reference * remove character * increase to meet contrast ratio of 3 * Update swatch setting info text (#3205) * Update info text * remove duplication * add space * clean up language and association * add to second place * Update 9 translation files * Update 4 translation files * Update 6 translation files * Update 1 translation file --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Quick order list] Change 'plural' string to 'singular' when removing '1 item' on 'Remove all' confirmation (#3203) * Change the message when removing only one item from the QOL * Update 20 translation files * Update 6 translation files * Update 4 translation files --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (#3202) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * update version number and release notes --------- Co-authored-by: melissaperreault Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> * Update 1 translation file (#3232) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Fix cart drawer header background and cart note summary spacing * more cart drawer touch ups * remove some of the unwanted changes --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: melissaperreault Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> * fix missing alt tags for collection images (#3262) * Update titles (#3265) * Condense country selector width when there are no currencies (#3269) * Recreate existing PR based on the right branch (#3274) * Fix product review alignment when product doesn't have medias (#3264) * Fix product review alignment when product doesn't have medias * Add the escape to match with branch target * Touch up scroll into view PDP (#3276) * Fix mobile behaviour for scroll into view * remove conditions * remove unused data attribute (#3277) * Remove sticky header on cart drawer to avoid overlap of content (#3279) * fix scrolling scenario on mobile (#3286) * Update 1 translation file (#3202) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Pull update from release branch and update version number and release notes (#3229) * Fix translation path (#3198) * Change product variant swatches' border color (#3204) * change color reference * remove character * increase to meet contrast ratio of 3 * Update swatch setting info text (#3205) * Update info text * remove duplication * add space * clean up language and association * add to second place * Update 9 translation files * Update 4 translation files * Update 6 translation files * Update 1 translation file --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Quick order list] Change 'plural' string to 'singular' when removing '1 item' on 'Remove all' confirmation (#3203) * Change the message when removing only one item from the QOL * Update 20 translation files * Update 6 translation files * Update 4 translation files --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (#3202) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * update version number and release notes --------- Co-authored-by: melissaperreault Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> * Update 1 translation file (#3232) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update README.md (#3128) * Update README.md * fix url formatting --------- Co-authored-by: Ludo * Fix Theme Check offences (#3283) * Fix schema JSON formatting Co-authored-by: Abhishek Jani * Add loading=eager attribute to gift card page img * Use liquid tag to combine successive liquid statements Co-authored-by: Abhishek Jani * Remove snippet to avoid > 3 levels of nested snippets * Ignore AssetPreload theme check for font links --------- Co-authored-by: Abhishek Jani * update release notes --------- Co-authored-by: melissaperreault Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> Co-authored-by: Renan Souza <77407058+renanvsouza@users.noreply.github.com> Co-authored-by: Abdulrahman Hamideh Co-authored-by: Benjamin Sehl Co-authored-by: Kai Co-authored-by: Abhishek Jani --- assets/component-cart-drawer.css | 15 +- assets/component-localization-form.css | 5 +- assets/component-rating.css | 4 + assets/media-gallery.js | 10 +- release-notes.md | 21 +- sections/collapsible-content.liquid | 2 +- sections/featured-collection.liquid | 2 +- sections/featured-product.liquid | 66 +- sections/main-collection-banner.liquid | 2 +- sections/main-product.liquid | 1206 +++++++++++++----------- sections/predictive-search.liquid | 12 +- snippets/card-collection.liquid | 2 +- snippets/country-localization.liquid | 11 +- 13 files changed, 735 insertions(+), 623 deletions(-) diff --git a/assets/component-cart-drawer.css b/assets/component-cart-drawer.css index c3d7629b..36ee30b9 100644 --- a/assets/component-cart-drawer.css +++ b/assets/component-cart-drawer.css @@ -100,8 +100,8 @@ cart-drawer:not(.is-empty) .cart-drawer__collection { } .drawer__close svg { - height: 2.4rem; - width: 2.4rem; + height: 2rem; + width: 2rem; } .drawer__contents { @@ -132,7 +132,7 @@ cart-drawer-items.is-empty + .drawer__footer { display: flex; position: relative; line-height: 1; - padding: 1.5rem 0; + padding: 1.5rem 2.8rem 1.5rem 0; } .drawer__footer > details + .cart-drawer__footer { @@ -182,9 +182,6 @@ cart-drawer { .cart-drawer thead { display: inline-table; width: 100%; - position: sticky; - top: 0; - z-index: 2; } cart-drawer-items { @@ -205,7 +202,7 @@ cart-drawer-items { .cart-drawer .cart-item { display: grid; grid-template: repeat(2, auto) / repeat(4, 1fr); - gap: 1.5rem; + gap: 1rem; margin-bottom: 0; } @@ -255,7 +252,7 @@ cart-drawer-items { } .cart-drawer .cart-items td { - padding-top: 2rem; + padding-top: 1.7rem; } .cart-drawer .cart-item > td + td { @@ -312,7 +309,7 @@ cart-drawer-items { } .cart-drawer .tax-note { - margin: 1.2rem 0 1rem auto; + margin: 1.2rem 0 2rem auto; text-align: left; } diff --git a/assets/component-localization-form.css b/assets/component-localization-form.css index e607b87b..435f1828 100644 --- a/assets/component-localization-form.css +++ b/assets/component-localization-form.css @@ -173,11 +173,14 @@ noscript .localization-selector.link { } .country-selector__list { - width: 25.5rem; padding-bottom: 0.95rem; padding-top: 0; } +.country-selector__list--with-multiple-currencies { + width: 25.5rem; +} + .country-selector__close-button { display: none; } diff --git a/assets/component-rating.css b/assets/component-rating.css index 2ab84ec7..05bbcfc9 100644 --- a/assets/component-rating.css +++ b/assets/component-rating.css @@ -1,3 +1,7 @@ +.product--no-media .rating-wrapper { + text-align: center; +} + .rating { display: inline-block; margin: 0; diff --git a/assets/media-gallery.js b/assets/media-gallery.js index 5b2520fd..7b8692cd 100644 --- a/assets/media-gallery.js +++ b/assets/media-gallery.js @@ -46,12 +46,14 @@ if (!customElements.get('media-gallery')) { this.preventStickyHeader(); window.setTimeout(() => { - if (this.elements.thumbnails) { + if (!this.mql.matches || this.elements.thumbnails) { activeMedia.parentElement.scrollTo({ left: activeMedia.offsetLeft }); } - if (!this.elements.thumbnails || this.dataset.desktopLayout === 'stacked') { - activeMedia.scrollIntoView({ behavior: 'smooth' }); - } + const activeMediaRect = activeMedia.getBoundingClientRect(); + // Don't scroll if the image is already in view + if (activeMediaRect.top > -0.5) return; + const top = activeMediaRect.top + window.scrollY; + window.scrollTo({ top: top, behavior: 'smooth' }); }); this.playActiveMedia(activeMedia); diff --git a/release-notes.md b/release-notes.md index f76b02c7..10398c42 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,15 +1,10 @@ -Dawn 13.0.0 adds support for color swatches, improvements to the country selector, and tweaks and fixes to other sections. It also includes a breaking change to Color Schemes; see the Changed notes below for details. -### Added -- The Variant Picker now supports color swatches! This depends on the [Product Taxonomy](help.shopify.com/manual/products/details/product-category) feature, which is rolling out gradually over the coming weeks. -- We reworked the country selector, which now includes search, a new “popular countries” section, and a generally improved look and feel especially on smaller screens. +Dawn 13.0.1 introduces a few fixes. ### Changed -- **Important**: If you use Color Schemes, they will reset to their default values due to an internal change to the feature. -- If you are using the Search & Discovery app, you can now change how dynamic facet lists treat filters with no product matches. +- The cart drawer header (Product, Total) is not sticky anymore when the content is scrollable ### Fixes and improvements -- We added a default font for input fields, they now inherit the body font instead of falling back to a system default font. -- We fixed an issue when adding cart notes that would prevent them from showing during checkout. -- We fixed an accessibility bug where filter colors were displaying incorrectly in high contrast mode. -- We updated the Multicolumn Section to provide a slider on tablet-sized screens, like it does on phone-sized screens. -- We fixed a bug where the Localization Selector was slightly obscured when using Sticky Header and scrolling while the selector was open. -- We fixed a bug that prevented the Product Grid Section from using the correct Image Shape in its Product Cards. -- We subtly increased the font size for inline quantity errors on product pages to make them more readable. +- Fix product rating alignment when the product doesn't have a media +- Fix scroll issue on variant change +- Limit width of country selector when the currency is the same for all the countries +- Fix missing alt tags for the collection image on the collection page as well as for collection cards +- Fix cart drawer's cart note to prevent overlapping of the text and caret icon +- Fix cart drawer's header to prevent an overlap with the items in the cart \ No newline at end of file diff --git a/sections/collapsible-content.liquid b/sections/collapsible-content.liquid index c5f23f74..7018f1a6 100644 --- a/sections/collapsible-content.liquid +++ b/sections/collapsible-content.liquid @@ -83,7 +83,7 @@ {% render 'icon-accordion', icon: block.settings.icon %}

- {{ block.settings.heading | default: block.settings.page.title }} + {{ block.settings.heading | default: block.settings.page.title | escape }}

{% render 'icon-caret' %} diff --git a/sections/featured-collection.liquid b/sections/featured-collection.liquid index 4a2af497..31cdfd6b 100644 --- a/sections/featured-collection.liquid +++ b/sections/featured-collection.liquid @@ -158,7 +158,7 @@ {{ 'sections.featured_collection.view_all' | t }} diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid index a7208069..b8a2b163 100644 --- a/sections/featured-product.liquid +++ b/sections/featured-product.liquid @@ -468,39 +468,41 @@ {{ block.settings.custom_liquid }} {%- when 'rating' -%} {%- if product.metafields.reviews.rating.value != blank -%} - {% liquid - assign rating_decimal = 0 - assign decimal = product.metafields.reviews.rating.value.rating | modulo: 1 - if decimal >= 0.3 and decimal <= 0.7 - assign rating_decimal = 0.5 - elsif decimal > 0.7 - assign rating_decimal = 1 - endif - %} - + {%- if section.settings.media_position == 'right' -%} + {% comment %} Duplicate gallery to display after product content on tablet/desktop breakpoint {% endcomment %} +
+ {% render 'product-media-gallery', variant_images: variant_images, is_duplicate: true %} +
+ {%- endif -%} + - {% render 'product-media-modal' variant_images: variant_images %} + {% render 'product-media-modal', variant_images: variant_images %} - {% assign popups = section.blocks | where: 'type', 'popup' %} - {%- for block in popups -%} - - - - {%- endfor -%} + + {%- endfor -%} - {%- if product.media.size > 0 -%} - - - {%- endif -%} + {%- if product.media.size > 0 -%} + + + {%- endif -%} - {%- if first_3d_model -%} - - - {%- endif -%} + {%- if first_3d_model -%} + + + {%- endif -%} - + - {%- liquid - if product.selected_or_first_available_variant.featured_media - assign seo_media = product.selected_or_first_available_variant.featured_media - else - assign seo_media = product.featured_media - endif - -%} + {%- liquid + if product.selected_or_first_available_variant.featured_media + assign seo_media = product.selected_or_first_available_variant.featured_media + else + assign seo_media = product.featured_media + endif + -%} - + diff --git a/sections/predictive-search.liquid b/sections/predictive-search.liquid index cd368893..ad2add59 100644 --- a/sections/predictive-search.liquid +++ b/sections/predictive-search.liquid @@ -54,7 +54,7 @@ >
-

{{ collection.title }}

+

{{ collection.title | escape }}

 @@ -85,7 +85,7 @@ >
-

{{ page.title }}

+

{{ page.title | escape }}

 @@ -99,7 +99,7 @@ >
-

{{ article.title }}

+

{{ article.title | escape }}

 @@ -157,7 +157,7 @@ {{ product.vendor }} {%- endif -%} -

{{ product.title }}

+

{{ product.title | escape }}

{%- if settings.predictive_search_show_price -%} {% render 'price', product: product, use_variant: true, show_badges: false %} {%- endif -%} @@ -191,7 +191,7 @@ >
-

{{ page.title }}

+

{{ page.title | escape }}

 @@ -205,7 +205,7 @@ >
-

{{ article.title }}

+

{{ article.title | escape }}

 diff --git a/snippets/card-collection.liquid b/snippets/card-collection.liquid index f5b879e1..81225e9e 100644 --- a/snippets/card-collection.liquid +++ b/snippets/card-collection.liquid @@ -67,7 +67,7 @@ (min-width: 750px) {% if columns > 1 %}calc((100vw - 10rem) / 2){% else %}calc(100vw - 10rem){% endif %}, calc(100vw - 3rem) " - alt="" + alt="{{ card_collection.featured_image.alt | escape }}" height="{{ card_collection.featured_image.height }}" width="{{ card_collection.featured_image.width }}" loading="lazy" diff --git a/snippets/country-localization.liquid b/snippets/country-localization.liquid index 1672515f..94870aa6 100644 --- a/snippets/country-localization.liquid +++ b/snippets/country-localization.liquid @@ -18,6 +18,11 @@ if localization.available_countries.size > 9 and popular_countries.size > 1 assign show_popular_countries = true endif + + assign show_currencies = false + if currencies.size > 1 + assign show_currencies = true + endif %}
@@ -83,7 +88,7 @@
{% if show_popular_countries %} @@ -111,7 +116,7 @@ {%- render 'icon-checkmark' -%} {{- country.name }} - + {{ country.currency.iso_code }} {{ country.currency.symbol -}} @@ -140,7 +145,7 @@ {%- render 'icon-checkmark' -%} {{- country.name }} - + {{ country.currency.iso_code }} {{ country.currency.symbol -}}