From 181bdeb0b9ad9033385b348ee2ef02c5338ec358 Mon Sep 17 00:00:00 2001 From: zeroByte Date: Wed, 31 Jan 2024 23:14:46 +0800 Subject: [PATCH] merge from origin (#1) * Update 1 translation file (#2997) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (#3001) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Image_tag] Update to remove lazy loading and let it automatically decide the best loading strategy (#3002) * remove lazy loading where necessary to better performance * add fetch priority * [Facets] update filter counts on filter selection (#2988) * Correct CSS (#3003) * Check if there is compare_at_price (#3000) * Update 1 translation file (#3012) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Facets] fix mobile count update (#3018) * Update 1 translation file (#3043) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (#3044) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Image with text] Add color scheme picker for section wrapper (#3016) * [Image with text] Add color scheme picker for section wrapper * address review comment about overlap and transparency * Refactor `quick-order-list.css` (#3006) * Fix Add to Cart error on page load/slower connections (#3008) * [Facets] dynamic header (#3048) * Add component-card.css to cart drawer (#3049) * [Refactoring] Replace loading spinner with snippet (#2996) * Change spinner for main-cart-items * Change spinner for cart-drawer * remove extra div and change classes * Replace spinner with snippet for pdp and fead prod * Remove unnecessary classes * Add comment for snippet * Change naming for files and css classes * Put back deleted elements * Remove unused classes * Put back loading-overlay for cases when no spinner * Chnage loading-overlay--error name * Minor change in CSS * Move loading-overlay styles to template-collection * Rename component-loading-overlay * Fix bug with overlay and spinner for facets * Remove component-loading-spinner import from files * Use spinner snippet for predictive search * Hide product count when loading for drawer filters * Address feedback. Clean-up. * Minor changes to address feedback * Fix spinner conflict with cart drawer * Address feedabck * Add missing whitespace for if tag * [Sliders] Regression fix. Apply CSS only when necessary in theme editor (#3070) * [Sliders] Regretion fix. Apply CSS only when necessary in theme editor * change of approach * add comment to explain CSS * Add visual representation for filters (#3045) * [Facets] update visual representation of facets operators (#3061) * [Collection template] Product grid color scheme picker (#3017) * [Collection template] Product grid color scheme picker] * move color setting up in the list * support gradient * [Cart] Add color picker on cart page and in general cart settings (#3021) * rebase final final * use the update for the loading spinner * add color picker for the cart drawer and cart popup * fix spacing issues on cart page * add gradient support * address review comments * adjust where the class is added. Fix gradient issue * isolation needed for shadow * add comment * Remove unnecessary isolate * use the isolate class instead * [Product] Add color scheme picker (#3015) * [Product] Add color scheme picker * support gradient * apply background color to be full width * address review comments: color scheme applied to quick add modal and lightbox modal * add color scheme to product availability drawer and move color settings up * fix color classes to work properly with gradients * Add support for gradient on modal * remove console log * [VisualDisplay] bump the active outline width (#3083) (#3091) * 12.0.0 Version Bump and release notes (#3092) * Update 1 translation file (#3093) * updated code to match new color scheme naming (#2801) * updated code to match new color scheme naming * removing additional background-1 after rebase * Fixed race condition for cart note updates (#3125) * [Facets] support dynamic facet lists (#3123) * Assign font family to input fields (#2871) * Price per item, Popover and global style bugs (#2851) * Fix cart submission on Quick Order List (#2868) * Social icons: Visual fixes (#2855) * Adjust spacing. * Facebook + Tumblr icon size adjustments. * Update social icon SVGs. * Tidy up new icon sizes again. * Resize icons. * Make spacing slightly smaller. * Make icons larger so they're more similar to the old sizes. * Remove padding to compensate for extra viewbox space. * Try a smaller Twitter icon. * Update snapchat icon. * Resize social links in menu drawer to 44x44 * replace translation string to have the translation visible (#2869) * B2B compare at price with price range (#2858) * Add sale badge and price-range for volume-pricing * Add compare_at price to PDP and Feat Prod. * Change opacity to 100% for price per item. * Update the logic * Hide price per item for unavailable variants. * Remove margin for dl. * Refactoring * Correct a mistake in liquid. * Change the JS logic back for updating price per item * Add compare at to prod card. Add style to compare at * Assign font family to input fields. * Update assets/base.css Co-authored-by: Kai * Use the theme's font style + weight in form elements. --------- Co-authored-by: Sofia Matulis Co-authored-by: melissaperreault Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> Co-authored-by: Kai * Update 1 translation file (#3155) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (#3157) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (#3158) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (#3161) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 2 translation files (#3160) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Applied image shape and ratio to placeholder images (#2817) added classes and styles to get image shape and image ratio working added styling on portrait placeholders aligned placeholder when in potrait mode applying code review suggestions and removed image-ratio * [Visual Display] Display accurate filter colors when high contrast mode is enabled (#3165) * Improved country selectors (#3175) Original PR with review comments -> https://github.com/Shopify/dawn/pull/3135 * Update inline quantity error styles. (#3150) * Update 1 translation file (#3177) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Variant Picker] Update settings copy (#3173) * Bring back the lighthouse-ci-action to v1 (#3181) This will make sure new releases are automatically used. Better for forks as well. * Changed slider to work on tablet for multicolumn (#3176) * Changed slider to work on tablet for multicolumn * Adjusted to prevent early cutoff on tablet * Adjusted Featured Collection placeholders to work with any number of desktop columns (#3182) * Adjusted featured collection placeholders to work with any number of desktop columns * [Variant Picker] Add swatch display type (#3180) * [VariantPicker] Unify variant selects and radios under new component * [VariantPicker] Add swatch settings * [VariantPicker] Move styles to dedicated CSS file * [Variant Picker] Update settings copy * [VariantPicker] Add swatch component * [VariantPicker] Add a swatch to selected dropdown option * [Variant Picker] Update disabled state * [Variant Picker] Swatch snippet * [Variant Picker] Swatch input snippet * [Variant Picker] Tweak swatch border colors * Update swatch border (#3184) * Update translations: merchant (#3178) * Update 1 translation file * Update 1 translation file * Update 2 translation files * Update 1 translation file --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Variant Picker] Ensure that swatches wrap correctly (#3185) * Focus search on country selector open and fix iOS bug (#3183) * Focus search on country selector open * Set stacking context * Prevent sticky header from hiding when country selector is open (#3188) * change to 100% (#3190) * [Variant Picker] Simplify swatch settings (#3189) * [Variant Picker] Simplify swatch settings * Update 7 translation files * Update 12 translation files * Update 1 translation file --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Escape filter label consistently (#3192) * Update 1 translation file (#3202) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> --------- Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo Co-authored-by: Patrick Racicot Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> Co-authored-by: Andrew Etchen Co-authored-by: Jason Addleman Co-authored-by: Sofia Matulis Co-authored-by: Louisa Goncharenko <93098869+lougoncharenko@users.noreply.github.com> Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com> Co-authored-by: Kjell Reigstad Co-authored-by: melissaperreault Co-authored-by: Kai Co-authored-by: Alex Ilea <6627543+alisterdev@users.noreply.github.com> Co-authored-by: Abdulrahman Hamideh Co-authored-by: CP Clermont --- .github/workflows/ci.yml | 2 +- assets/base.css | 16 +- assets/cart.js | 12 +- assets/collapsible-content.css | 2 +- assets/component-card.css | 3 +- assets/component-cart-drawer.css | 7 +- assets/component-cart-items.css | 45 +- assets/component-cart.css | 6 +- assets/component-facets.css | 140 ++- assets/component-image-with-text.css | 4 +- ...rlay.css => component-loading-spinner.css} | 31 +- assets/component-localization-form.css | 177 +++- assets/component-menu-drawer.css | 8 + assets/component-product-variant-picker.css | 158 ++++ assets/component-search.css | 4 + assets/component-slider.css | 4 - assets/component-swatch-input.css | 69 ++ assets/component-swatch.css | 23 + assets/component-visual-display.css | 90 ++ assets/facets.js | 106 ++- assets/global.js | 79 +- assets/localization-form.js | 163 +++- assets/magnify.js | 2 +- assets/pickup-availability.js | 4 + assets/product-form.js | 10 +- assets/product-info.js | 5 +- assets/quantity-popover.css | 2 +- assets/quick-add.js | 12 +- assets/quick-order-list.css | 145 +--- assets/quick-order-list.js | 12 +- assets/section-footer.css | 8 +- assets/section-image-banner.css | 4 +- assets/section-main-product.css | 122 +-- assets/section-multicolumn.css | 9 + assets/template-collection.css | 19 + config/settings_data.json | 24 +- config/settings_schema.json | 18 +- layout/theme.liquid | 15 + locales/bg-BG.json | 8 +- locales/cs.json | 10 +- locales/cs.schema.json | 34 +- locales/da.json | 10 +- locales/da.schema.json | 34 +- locales/de.json | 8 +- locales/de.schema.json | 36 +- locales/el.json | 8 +- locales/en.default.json | 6 +- locales/en.default.schema.json | 30 +- locales/es.json | 8 +- locales/es.schema.json | 30 +- locales/fi.json | 8 +- locales/fi.schema.json | 30 +- locales/fr.json | 14 +- locales/fr.schema.json | 62 +- locales/hr-HR.json | 8 +- locales/hu.json | 8 +- locales/id.json | 8 +- locales/it.json | 8 +- locales/it.schema.json | 30 +- locales/ja.json | 14 +- locales/ja.schema.json | 34 +- locales/ko.json | 8 +- locales/ko.schema.json | 34 +- locales/lt-LT.json | 8 +- locales/nb.json | 8 +- locales/nb.schema.json | 58 +- locales/nl.json | 8 +- locales/nl.schema.json | 30 +- locales/pl.json | 8 +- locales/pl.schema.json | 30 +- locales/pt-BR.json | 8 +- locales/pt-BR.schema.json | 30 +- locales/pt-PT.json | 8 +- locales/pt-PT.schema.json | 34 +- locales/ro-RO.json | 8 +- locales/ru.json | 8 +- locales/sk-SK.json | 8 +- locales/sl-SI.json | 8 +- locales/sv.json | 8 +- locales/sv.schema.json | 34 +- locales/th.json | 8 +- locales/th.schema.json | 34 +- locales/tr.json | 8 +- locales/tr.schema.json | 30 +- locales/vi.json | 8 +- locales/vi.schema.json | 30 +- locales/zh-CN.json | 8 +- locales/zh-CN.schema.json | 100 ++- locales/zh-TW.json | 8 +- locales/zh-TW.schema.json | 116 ++- release-notes.md | 35 +- sections/announcement-bar.liquid | 8 +- sections/collage.liquid | 8 +- sections/collapsible-content.liquid | 5 +- sections/collection-list.liquid | 2 +- sections/contact-form.liquid | 2 +- sections/custom-liquid.liquid | 2 +- sections/email-signup-banner.liquid | 2 +- sections/featured-blog.liquid | 2 +- sections/featured-collection.liquid | 14 +- sections/featured-product.liquid | 49 +- sections/footer-group.json | 2 +- sections/footer.liquid | 2 +- sections/header-group.json | 4 +- sections/header.liquid | 10 +- sections/image-banner.liquid | 14 +- sections/image-with-text.liquid | 158 ++-- sections/main-cart-footer.liquid | 16 +- sections/main-cart-items.liquid | 806 +++++++++--------- sections/main-collection-banner.liquid | 2 +- sections/main-collection-product-grid.liquid | 23 +- sections/main-password-footer.liquid | 2 +- sections/main-password-header.liquid | 2 +- sections/main-product.liquid | 60 +- sections/main-search.liquid | 198 +++-- sections/multicolumn.liquid | 7 +- sections/multirow.liquid | 8 +- sections/newsletter.liquid | 2 +- sections/page.liquid | 2 +- sections/predictive-search.liquid | 352 +++++--- sections/quick-order-list.liquid | 6 +- sections/related-products.liquid | 4 +- sections/rich-text.liquid | 2 +- sections/slideshow.liquid | 24 +- sections/video.liquid | 10 +- snippets/buy-buttons.liquid | 17 +- snippets/card-product.liquid | 46 +- snippets/cart-drawer.liquid | 18 +- snippets/cart-notification.liquid | 4 +- snippets/country-localization.liquid | 154 +++- snippets/facets.liquid | 272 +++--- snippets/header-search.liquid | 121 +-- snippets/language-localization.liquid | 13 +- snippets/loading-overlay.liquid | 15 - snippets/loading-spinner.liquid | 22 + snippets/price.liquid | 2 +- snippets/product-media-modal.liquid | 4 +- snippets/product-thumbnail.liquid | 12 +- snippets/product-variant-options.liquid | 50 +- snippets/product-variant-picker.liquid | 106 ++- snippets/quick-order-list-row.liquid | 4 +- snippets/swatch-input.liquid | 45 + snippets/swatch.liquid | 31 + snippets/visual-display.liquid | 45 + templates/cart.json | 2 +- templates/collection.json | 2 +- templates/index.json | 12 +- templates/page.contact.json | 2 +- templates/password.json | 2 +- templates/product.json | 6 +- 150 files changed, 3737 insertions(+), 1817 deletions(-) rename assets/{component-loading-overlay.css => component-loading-spinner.css} (60%) create mode 100644 assets/component-product-variant-picker.css create mode 100644 assets/component-swatch-input.css create mode 100644 assets/component-swatch.css create mode 100644 assets/component-visual-display.css delete mode 100644 snippets/loading-overlay.liquid create mode 100644 snippets/loading-spinner.liquid create mode 100644 snippets/swatch-input.liquid create mode 100644 snippets/swatch.liquid create mode 100644 snippets/visual-display.liquid diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eee9633412..1612552a734 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Lighthouse - uses: shopify/lighthouse-ci-action@v1.1.1 + uses: shopify/lighthouse-ci-action@v1 with: store: ${{ secrets.SHOP_STORE_OS2 }} password: ${{ secrets.SHOP_PASSWORD_OS2 }} diff --git a/assets/base.css b/assets/base.css index 2c2c806e6d3..151b99b9519 100644 --- a/assets/base.css +++ b/assets/base.css @@ -1373,7 +1373,7 @@ button.shopify-payment-button__button--unbranded { } } -.button.loading > .loading-overlay__spinner { +.button.loading > .loading__spinner { top: 50%; left: 50%; transform: translate(-50%, -50%); @@ -1383,11 +1383,11 @@ button.shopify-payment-button__button--unbranded { align-items: center; } -.button.loading > .loading-overlay__spinner .spinner { +.button.loading > .loading__spinner .spinner { width: fit-content; } -.button.loading > .loading-overlay__spinner .path { +.button.loading > .loading__spinner .path { stroke: rgb(var(--color-button-text)); } @@ -1585,6 +1585,9 @@ details[open] > .share-button__fallback { appearance: none; background-color: rgb(var(--color-background)); color: rgb(var(--color-foreground)); + font-family: var(--font-body-family); + font-style: var(--font-body-style); + font-weight: var(--font-body-weight); font-size: 1.6rem; width: 100%; box-sizing: border-box; @@ -1925,6 +1928,9 @@ input[type='checkbox'] { .quantity__input { color: currentColor; + font-family: var(--font-body-family); + font-style: var(--font-body-style); + font-weight: var(--font-body-weight); font-size: 1.6rem; font-weight: 500; opacity: 0.85; @@ -2021,8 +2027,8 @@ input[type='checkbox'] { position: relative; } -product-info .loading-overlay:not(.hidden) ~ *, -.quantity__rules-cart .loading-overlay:not(.hidden) ~ * { +product-info .loading__spinner:not(.hidden) ~ *, +.quantity__rules-cart .loading__spinner:not(.hidden) ~ * { visibility: hidden; } diff --git a/assets/cart.js b/assets/cart.js index 9ab23ea3956..7727d7ec629 100644 --- a/assets/cart.js +++ b/assets/cart.js @@ -170,7 +170,7 @@ class CartItems extends HTMLElement { publish(PUB_SUB_EVENTS.cartUpdate, { source: 'cart-items', cartData: parsedState, variantId: variantId }); }) .catch(() => { - this.querySelectorAll('.loading-overlay').forEach((overlay) => overlay.classList.add('hidden')); + this.querySelectorAll('.loading__spinner').forEach((overlay) => overlay.classList.add('hidden')); const errors = document.getElementById('cart-errors') || document.getElementById('CartDrawer-CartErrors'); errors.textContent = window.cartStrings.error; }) @@ -203,8 +203,8 @@ class CartItems extends HTMLElement { const mainCartItems = document.getElementById('main-cart-items') || document.getElementById('CartDrawer-CartItems'); mainCartItems.classList.add('cart__items--disabled'); - const cartItemElements = this.querySelectorAll(`#CartItem-${line} .loading-overlay`); - const cartDrawerItemElements = this.querySelectorAll(`#CartDrawer-Item-${line} .loading-overlay`); + const cartItemElements = this.querySelectorAll(`#CartItem-${line} .loading__spinner`); + const cartDrawerItemElements = this.querySelectorAll(`#CartDrawer-Item-${line} .loading__spinner`); [...cartItemElements, ...cartDrawerItemElements].forEach((overlay) => overlay.classList.remove('hidden')); @@ -216,8 +216,8 @@ class CartItems extends HTMLElement { const mainCartItems = document.getElementById('main-cart-items') || document.getElementById('CartDrawer-CartItems'); mainCartItems.classList.remove('cart__items--disabled'); - const cartItemElements = this.querySelectorAll(`#CartItem-${line} .loading-overlay`); - const cartDrawerItemElements = this.querySelectorAll(`#CartDrawer-Item-${line} .loading-overlay`); + const cartItemElements = this.querySelectorAll(`#CartItem-${line} .loading__spinner`); + const cartDrawerItemElements = this.querySelectorAll(`#CartDrawer-Item-${line} .loading__spinner`); cartItemElements.forEach((overlay) => overlay.classList.add('hidden')); cartDrawerItemElements.forEach((overlay) => overlay.classList.add('hidden')); @@ -234,7 +234,7 @@ if (!customElements.get('cart-note')) { super(); this.addEventListener( - 'change', + 'input', debounce((event) => { const body = JSON.stringify({ note: event.target.value }); fetch(`${routes.cart_update_url}`, { ...fetchConfig(), ...{ body } }); diff --git a/assets/collapsible-content.css b/assets/collapsible-content.css index 28a371358f7..232ce8da717 100644 --- a/assets/collapsible-content.css +++ b/assets/collapsible-content.css @@ -70,7 +70,7 @@ border-top: 0; } -.collapsible-row-layout .accordion:not(:first-child):not(.color-background-1) { +.collapsible-row-layout .accordion:not(:first-child):not(.color-scheme-1) { margin-top: 1rem; } diff --git a/assets/component-card.css b/assets/component-card.css index eb841680ace..b4c8458c285 100644 --- a/assets/component-card.css +++ b/assets/component-card.css @@ -68,7 +68,7 @@ } /* Needed for gradient continuity with or without animation so that transparent PNG images come up as we would expect */ -.card__inner.color-background-1 { +.card__inner.color-scheme-1 { background: transparent; } @@ -300,7 +300,6 @@ } .card--standard:not(.card--horizontal) .placeholder-svg { - height: auto; width: 100%; } diff --git a/assets/component-cart-drawer.css b/assets/component-cart-drawer.css index d8869ace452..c3d7629b8d9 100644 --- a/assets/component-cart-drawer.css +++ b/assets/component-cart-drawer.css @@ -22,7 +22,6 @@ padding: 0 1.5rem; border: 0.1rem solid rgba(var(--color-foreground), 0.2); border-right: 0; - background-color: rgb(var(--color-background)); overflow: hidden; display: flex; flex-direction: column; @@ -33,7 +32,6 @@ .drawer__inner-empty { height: 100%; padding: 0 1.5rem; - background-color: rgb(var(--color-background)); overflow: hidden; display: flex; flex-direction: column; @@ -72,7 +70,6 @@ cart-drawer:not(.is-empty) .cart-drawer__collection { .drawer__header { position: relative; - background-color: rgb(var(--color-background)); padding: 1.5rem 0; display: flex; justify-content: space-between; @@ -114,7 +111,6 @@ cart-drawer:not(.is-empty) .cart-drawer__collection { } .drawer__footer { - background-color: rgb(var(--color-background)); border-top: 0.1rem solid rgba(var(--color-foreground), 0.2); padding: 1.5rem 0; } @@ -189,7 +185,6 @@ cart-drawer { position: sticky; top: 0; z-index: 2; - background-color: rgb(var(--color-background)); } cart-drawer-items { @@ -254,7 +249,7 @@ cart-drawer-items { margin-bottom: 1.5rem; } -.cart-drawer .cart-item .loading-overlay { +.cart-drawer .cart-item .loading__spinner { right: 5px; padding-top: 2.5rem; } diff --git a/assets/component-cart-items.css b/assets/component-cart-items.css index 6e6bc02cb79..fc1e7e1bb9a 100644 --- a/assets/component-cart-items.css +++ b/assets/component-cart-items.css @@ -1,3 +1,7 @@ +cart-items .title-wrapper-with-link { + margin-top: 0; +} + .cart-items td, .cart-items th { padding: 0; @@ -48,12 +52,12 @@ line-height: calc(1 + 0.4 / var(--font-body-scale)); } -.cart-item__details>* { +.cart-item__details > * { margin: 0; max-width: 30rem; } -.cart-item__details>*+* { +.cart-item__details > * + * { margin-top: 0.6rem; } @@ -83,7 +87,7 @@ text-decoration-thickness: 0.2rem; } -.cart-item__price-wrapper>* { +.cart-item__price-wrapper > * { display: block; margin: 0; padding: 0; @@ -151,7 +155,7 @@ cart-remove-button .icon-remove { width: 1.5rem; } -.cart-item .loading-overlay { +.cart-item .loading__spinner { top: 0; left: auto; right: auto; @@ -160,14 +164,14 @@ cart-remove-button .icon-remove { } @media screen and (min-width: 750px) { - .cart-item .loading-overlay { + .cart-item .loading__spinner { right: 0; padding-top: 4.5rem; bottom: auto; } } -.cart-item .loading-overlay:not(.hidden)~* { +.cart-item .loading__spinner:not(.hidden) ~ * { visibility: hidden; } @@ -180,23 +184,25 @@ cart-remove-button .icon-remove { } .cart-item__error-text { - font-size: 1.2rem; - line-height: calc(1 + 0.2 / var(--font-body-scale)); + font-size: 1.3rem; + line-height: 1.4; + letter-spacing: 0.04rem; order: 1; } -.cart-item__error-text+svg { +.cart-item__error-text + svg { flex-shrink: 0; - width: 1.2rem; - margin-right: 0.5rem; - margin-top: 0.1rem; + width: 1.5rem; + height: 1.5rem; + margin-right: 0.7rem; + margin-top: 0.25rem; } -.cart-item__error-text:empty+svg { +.cart-item__error-text:empty + svg { display: none; } -.product-option+.product-option { +.product-option + .product-option { margin-top: 0.4rem; } @@ -210,7 +216,6 @@ cart-remove-button .icon-remove { } @media screen and (max-width: 749px) { - .cart-items, .cart-items thead, .cart-items tbody { @@ -276,7 +281,7 @@ cart-remove-button .icon-remove { width: 50%; } - .cart-items th+th { + .cart-items th + th { padding-left: 4rem; } @@ -289,7 +294,7 @@ cart-remove-button .icon-remove { display: table-row; } - .cart-item>td+td { + .cart-item > td + td { padding-left: 4rem; } @@ -305,7 +310,7 @@ cart-remove-button .icon-remove { margin: 0.5rem 0 0 1.5rem; } - .cart-item__price-wrapper>*:only-child:not(.cart-item__discounted-prices) { + .cart-item__price-wrapper > *:only-child:not(.cart-item__discounted-prices) { margin-top: 1rem; } @@ -315,7 +320,6 @@ cart-remove-button .icon-remove { } @media screen and (min-width: 990px) { - .cart-item .cart-item__quantity, .cart-items .cart-items__heading--wide { padding-left: 6rem; @@ -331,10 +335,9 @@ cart-remove-button .icon-remove { } @media screen and (min-width: 750px) { - .cart-items .cart-items__heading--quantity, .cart-item .cart-item__quantity, - .cart-item__quantity--info quantity-popover>*, + .cart-item__quantity--info quantity-popover > *, .no-js .cart-item .cart-item__quantity--info { padding-left: 5rem; } diff --git a/assets/component-cart.css b/assets/component-cart.css index 34c3d49f8d0..8e107f60cd4 100644 --- a/assets/component-cart.css +++ b/assets/component-cart.css @@ -86,8 +86,6 @@ cart-items { top: 2.5rem; } - - .cart__note label { display: flex; align-items: flex-end; @@ -170,6 +168,10 @@ cart-items { margin: 0 auto; } +.cart__dynamic-checkout-buttons:has(.dynamic-checkout__content:empty) { + margin: 0; +} + .cart__dynamic-checkout-buttons div[role='button'] { border-radius: var(--buttons-radius-outset) !important; } diff --git a/assets/component-facets.css b/assets/component-facets.css index 119d326eada..ca766b95d91 100644 --- a/assets/component-facets.css +++ b/assets/component-facets.css @@ -223,11 +223,34 @@ transition: text-decoration var(--duration-short) ease; } -.facets__summary:hover span { +.facets__summary:hover .facets__summary-label { text-decoration: underline; text-underline-offset: 0.3rem; } +.facets__and-helptext { + color: rgba(var(--color-foreground), 0.5); + font-size: calc(var(--font-heading-scale) * 1.2rem); + line-height: calc(var(--font-heading-scale) * 1.2rem); +} + +@media only screen and (min-width: 750px) { + .facets__and-helptext { + font-size: calc(var(--font-heading-scale) * 1.3rem); + line-height: calc(var(--font-heading-scale) * 1.3rem); + } +} + +.facets__disclosure .facets__and-helptext, +.facets__disclosure-vertical .facets__and-helptext { + display: none; +} + +.facets__disclosure[open] .facets__and-helptext, +.facets__disclosure-vertical[open] .facets__and-helptext { + display: block; +} + .disclosure-has-popup[open] > .facets__summary::before { z-index: 2; } @@ -268,15 +291,50 @@ z-index: 1; } +.facets__header facet-remove { + align-self: center; +} + .facets__list { padding: 0.5rem 2rem; } +.facets-layout-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + text-align: center; + padding: 2rem 2.4rem; + gap: 3rem 1rem; +} + +.facets-layout-grid.facets__list--vertical { + padding: 1rem 0; +} + .facets__item { display: flex; align-items: center; } +/* Hover/focus state */ +.facets-layout-list .facets__label:hover .facet-checkbox__text, +.facets-layout-list input:focus ~ .facet-checkbox__text { + text-decoration: underline; +} + +.facets-layout-grid > * { + align-items: flex-start; +} + +.facets-layout-grid .visual-display-parent { + display: flex; + flex-direction: column; + gap: 0.8rem; + padding: 0; + height: 100%; + font-size: 1.3rem; +} + .facets__item label, .facets__item input[type='checkbox'] { cursor: pointer; @@ -291,6 +349,18 @@ word-break: break-word; } +/* Hover, active, and focus states */ +:is(.facets__label:hover, .facets__label.active, .facets__label:has(:focus-visible)) { + color: rgba(var(--color-foreground), 1); +} + +/* Focus states for older browsers */ +@supports not selector(:has(a, b)) { + .facets__label:focus-within { + color: rgba(var(--color-foreground), 1); + } +} + .facet-checkbox input[type='checkbox'] { position: absolute; opacity: 1; @@ -303,6 +373,23 @@ -webkit-appearance: none; } +.facets-layout-grid input[type='checkbox'] { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + height: 100%; + opacity: 0; +} + +.facets__visual-display-wrapper { + display: flex; + justify-content: center; + flex-shrink: 0; +} + .no-js .facet-checkbox input[type='checkbox'] { z-index: 0; } @@ -336,8 +423,10 @@ } } -.facet-checkbox--disabled { - color: rgba(var(--color-foreground), 0.4); +.facet-checkbox--disabled, +.mobile-facets__label--disabled { + opacity: 0.4; + pointer-events: none; } .facets__price { @@ -706,14 +795,20 @@ details.menu-opening .mobile-facets__close svg { .mobile-facets__close-button { align-items: center; background-color: transparent; - display: flex; font-size: 1.4rem; font: inherit; letter-spacing: inherit; margin-top: 1.5rem; padding: 1.2rem 2.6rem; text-decoration: none; - width: calc(100% - 5.2rem); + + display: grid; + grid-template-columns: min-content 1fr; + text-align: start; +} + +.mobile-facets__close-button > .facets__and-helptext { + grid-column-start: 2; } .no-js .mobile-facets__close-button { @@ -744,13 +839,6 @@ details.menu-opening .mobile-facets__close svg { } .mobile-facets__highlight { - opacity: 0; - visibility: hidden; -} - -.mobile-facets__checkbox:checked + .mobile-facets__highlight { - visibility: visible; - opacity: 1; position: absolute; top: 0px; left: 0px; @@ -758,6 +846,13 @@ details.menu-opening .mobile-facets__close svg { bottom: 0px; display: block; background-color: rgba(var(--color-foreground), 0.04); + opacity: 0; + visibility: hidden; +} + +.mobile-facets__checkbox:checked + .mobile-facets__highlight { + opacity: 1; + visibility: visible; } .mobile-facets__summary { @@ -768,8 +863,7 @@ details.menu-opening .mobile-facets__close svg { margin-left: auto; } -.mobile-facets__summary > div, -.facets__summary > div { +.mobile-facets__summary > div { display: flex; align-items: center; } @@ -854,10 +948,6 @@ input.mobile-facets__checkbox { display: block; } -.mobile-facets__label--disabled { - opacity: 0.5; -} - .mobile-facets__footer { border-top: 0.1rem solid rgba(var(--color-foreground), 0.08); padding: 2rem; @@ -927,24 +1017,21 @@ input.mobile-facets__checkbox { margin: 0; } -.product-count__text.loading { +#ProductCountDesktop.loading, +#ProductCount.loading { visibility: hidden; } -.product-count .loading-overlay__spinner, -.product-count-vertical .loading-overlay__spinner { - display: none; +.product-count .loading__spinner, +.product-count-vertical .loading__spinner { position: absolute; + padding-top: 0.6rem; right: 0; top: 50%; transform: translateY(-50%); width: 1.8rem; } -.product-count__text.loading + .loading-overlay__spinner { - display: block; -} - @media screen and (min-width: 750px) { .facets-vertical { display: flex; @@ -1009,6 +1096,7 @@ input.mobile-facets__checkbox { .product-count-vertical { margin-left: 3.5rem; + position: relative; } .facets-vertical .active-facets__button-wrapper { diff --git a/assets/component-image-with-text.css b/assets/component-image-with-text.css index fcf450334fd..e8a5a3c96b5 100644 --- a/assets/component-image-with-text.css +++ b/assets/component-image-with-text.css @@ -313,8 +313,8 @@ } /* Needed for gradient continuity with or without animation so that transparent PNG images come up as we would expect */ -.image-with-text:not(.image-with-text--overlap) .color-background-1, -.image-with-text.image-with-text--overlap .image-with-text__media.color-background-1 { +.image-with-text.image-with-text--overlap .backround-transparent, +.image-with-text:not(.image-with-text--overlap) .background-transparent { background: transparent; } diff --git a/assets/component-loading-overlay.css b/assets/component-loading-spinner.css similarity index 60% rename from assets/component-loading-overlay.css rename to assets/component-loading-spinner.css index a6c5e25c1bd..6cc341a3ed7 100644 --- a/assets/component-loading-overlay.css +++ b/assets/component-loading-spinner.css @@ -1,35 +1,14 @@ -.loading-overlay { +.loading__spinner { position: absolute; z-index: 1; width: 1.8rem; } -price-per-item .loading-overlay { - position: relative; -} - -@media screen and (max-width: 749px) { - .loading-overlay { - top: 0; - right: 0; - } -} - -@media screen and (min-width: 750px) { - .loading-overlay { - left: 0; - } -} - -.loading-overlay__spinner { +.loading__spinner { width: 1.8rem; display: inline-block; } -price-per-item .loading-overlay__spinner { - display: flex; -} - .spinner { animation: rotator 1.4s linear infinite; } @@ -71,12 +50,12 @@ price-per-item .loading-overlay__spinner { } } -.loading-overlay:not(.hidden) + .cart-item__price-wrapper, -.loading-overlay:not(.hidden) ~ cart-remove-button { +.loading__spinner:not(.hidden) + .cart-item__price-wrapper, +.loading__spinner:not(.hidden) ~ cart-remove-button { opacity: 50%; } -.loading-overlay:not(.hidden) ~ cart-remove-button { +.loading__spinner:not(.hidden) ~ cart-remove-button { pointer-events: none; cursor: default; } diff --git a/assets/component-localization-form.css b/assets/component-localization-form.css index 2285d96f6ab..e607b87bc3f 100644 --- a/assets/component-localization-form.css +++ b/assets/component-localization-form.css @@ -51,13 +51,20 @@ } .localization-form__currency { - display: inline-block; + opacity: 0; + transition: opacity 0.15s cubic-bezier(0.25, 0.46, 0.45, 0.94); + white-space: nowrap; + padding-right: 1.7rem; } @media screen and (max-width: 749px) { .localization-form .button { word-break: break-all; } + + .localization-form__currency { + opacity: 1; + } } .localization-form__select { @@ -149,6 +156,7 @@ noscript .localization-selector.link { border-radius: var(--popup-corner-radius); box-shadow: var(--popup-shadow-horizontal-offset) var(--popup-shadow-vertical-offset) var(--popup-shadow-blur-radius) rgba(var(--color-shadow), var(--popup-shadow-opacity)); + max-height: 27.5rem; } .disclosure__list { @@ -158,20 +166,165 @@ noscript .localization-selector.link { padding-bottom: 0.5rem; padding-top: 0.5rem; scroll-padding: 0.5rem 0; - min-height: 8.2rem; - max-height: 20.65rem; - max-width: 22rem; + max-height: 20.5rem; + max-width: 25.5rem; min-width: 12rem; width: max-content; } +.country-selector__list { + width: 25.5rem; + padding-bottom: 0.95rem; + padding-top: 0; +} + +.country-selector__close-button { + display: none; +} + +.country-filter { + display: flex; + justify-content: end; + align-items: center; + gap: 0.5rem; + padding: 1.5rem 1.5rem 0.6rem; + position: sticky; + top: -0.02rem; + background-color: rgb(var(--color-background)); + z-index: 6; +} + +.country-filter__reset-button, +.country-filter__search-icon { + right: calc(var(--inputs-border-width)); + top: var(--inputs-border-width); +} + +.country-filter__reset-button:not(:focus-visible)::after, +.country-filter__reset-button:not(:focus)::after { + display: block; + height: calc(100% - 1.8rem); + content: ''; + position: absolute; + right: 0; +} + +.country-filter__reset-button:focus, +.country-filter__reset-button:focus-visible { + background-color: rgb(var(--color-background)); + z-index: 4; +} + +.country-filter__reset-button:not(:focus-visible):not(.focused) { + box-shadow: inherit; + background-color: inherit; +} + +.country-filter__reset-button:hover .icon { + transform: scale(1.07); +} + +.country-filter__reset-button .icon.icon-close, +.country-filter__search-icon .icon { + height: 1.8rem; + width: 1.8rem; + stroke-width: 0.1rem; +} + +.country-filter__search-icon { + transition: opacity var(--duration-short) ease, visibility var(--duration-short) ease; + opacity: 1; + visibility: visible; + pointer-events: none; + cursor: text; +} + +.country-filter__search-icon--hidden { + opacity: 0; + visibility: hidden; +} + +@media screen and (max-width: 749px) { + .disclosure__list-wrapper.country-selector:not([hidden]) + .country-selector__overlay:empty { + display: block; + } + + .country-selector__overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(var(--color-foreground), 0.5); + z-index: 3; + animation: animateLocalization var(--duration-default) ease; + } + + .disclosure__list-wrapper.country-selector { + position: fixed; + bottom: -1rem; + left: 0; + width: 100%; + height: 80%; + max-height: 80vh; + border-radius: 0; + border: none; + box-shadow: none; + z-index: 4; + } + + .disclosure__list.country-selector__list { + max-height: 85%; + min-width: 100%; + margin-bottom: 0; + z-index: 5; + } + + .country-selector__close-button.link { + display: flex; + justify-content: center; + align-items: center; + padding: 0rem; + background-color: transparent; + height: 4.4rem; + width: 4.4rem; + } + + .country-selector__close-button .icon { + width: 2rem; + height: 2rem; + } + + .country-filter { + padding: 1.5rem 2rem 0.6rem 1.5rem; + } +} + +@media screen and (min-width: 750px) { + .country-filter--no-padding { + padding: 0; + } +} + +.countries { + padding-top: 0.6rem; +} + +.popular-countries { + border-bottom: 1px solid rgba(var(--color-foreground), 0.2); + padding-bottom: 0.6rem; + padding-top: 0.6rem; +} + .disclosure__item { position: relative; } .disclosure__link { - display: block; - padding: 0.95rem 3.5rem 0.95rem 2rem; + display: grid; + grid-template-columns: auto 1fr auto; + gap: 0.5rem; + padding: 0.9rem 1.5rem; text-decoration: none; line-height: calc(1 + 0.8 / var(--font-body-scale)); color: rgba(var(--color-foreground), 0.75); @@ -182,8 +335,16 @@ noscript .localization-selector.link { color: rgb(var(--color-foreground)); } -.disclosure__link--active { - text-decoration: underline; +.disclosure__link .icon-checkmark { + width: 1rem; + margin-right: 0.2rem; +} + +.disclosure__link:hover .localization-form__currency, +.disclosure__link:focus-visible .localization-form__currency, +.disclosure__link:focus .localization-form__currency { + display: inline-block; + opacity: 1; } .disclosure__button[aria-expanded='true'] .icon-caret { diff --git a/assets/component-menu-drawer.css b/assets/component-menu-drawer.css index beaf09bee50..a8a4fbcf658 100644 --- a/assets/component-menu-drawer.css +++ b/assets/component-menu-drawer.css @@ -263,3 +263,11 @@ details[open].menu-opening > .menu-drawer__submenu { .menu-drawer .list-social__link { padding: 1.1rem 1.1rem; } + +@media screen and (max-width: 749px) { + .menu-drawer.country-selector-open { + transform: none !important; + filter: none !important; + transition: none !important; + } +} diff --git a/assets/component-product-variant-picker.css b/assets/component-product-variant-picker.css new file mode 100644 index 00000000000..f62ef38157f --- /dev/null +++ b/assets/component-product-variant-picker.css @@ -0,0 +1,158 @@ +variant-selects { + display: block; +} + +.product--no-media .product-form__input--pill, +.product--no-media .product-form__input--swatch, +.product--no-media .product-form__input--dropdown { + display: flex; + align-items: center; + justify-content: center; + text-align: center; +} + +.product--no-media .product-form__input.product-form__input--pill, +.product--no-media .product-form__input.product-form__input--swatch { + flex-wrap: wrap; + margin: 0 auto 1.2rem auto; +} + +.product--no-media .product-form__input--dropdown { + flex-direction: column; + max-width: 100%; +} + +:is(.product-form__input--pill, .product-form__input--swatch) .form__label { + margin-bottom: 0.2rem; +} + +.product-form__input input[type='radio'] { + clip: rect(0, 0, 0, 0); + overflow: hidden; + position: absolute; + height: 1px; + width: 1px; +} + +.product-form__input input[type='radio']:not(.disabled) + label > .label-unavailable { + display: none; +} + +.product-form__input--dropdown { + --swatch-input--size: 2rem; + margin-bottom: 1.6rem; +} + + +.product-form__input--dropdown .dropdown-swatch + select { + padding-left: calc(2.4rem + var(--swatch-input--size)); +} + +.product-form__input--dropdown .dropdown-swatch { + position: absolute; + left: 1.6rem; + top: calc(50% - var(--swatch-input--size) / 2); + width: var(--swatch-input--size); + height: var(--swatch-input--size); + z-index: 1; +} + + +/* Custom styles for Pill display type */ +.product-form__input--pill input[type='radio'] + label { + border: var(--variant-pills-border-width) solid rgba(var(--color-foreground), var(--variant-pills-border-opacity)); + background-color: rgb(var(--color-background)); + color: rgba(var(--color-foreground)); + border-radius: var(--variant-pills-radius); + color: rgb(var(--color-foreground)); + display: inline-block; + margin: 0.7rem 0.5rem 0.2rem 0; + padding: 1rem 2rem; + font-size: 1.4rem; + letter-spacing: 0.1rem; + line-height: 1; + text-align: center; + transition: border var(--duration-short) ease; + cursor: pointer; + position: relative; +} + +.product-form__input--pill input[type='radio'] + label:before { + content: ''; + position: absolute; + top: calc(var(--variant-pills-border-width) * -1); + right: calc(var(--variant-pills-border-width) * -1); + bottom: calc(var(--variant-pills-border-width) * -1); + left: calc(var(--variant-pills-border-width) * -1); + z-index: -1; + border-radius: var(--variant-pills-radius); + box-shadow: var(--variant-pills-shadow-horizontal-offset) var(--variant-pills-shadow-vertical-offset) + var(--variant-pills-shadow-blur-radius) rgba(var(--color-shadow), var(--variant-pills-shadow-opacity)); +} + +.product-form__input--pill input[type='radio'] + label:hover { + border-color: rgb(var(--color-foreground)); +} + +.product-form__input--pill input[type='radio']:checked + label { + background-color: rgb(var(--color-foreground)); + color: rgb(var(--color-background)); +} + +@media screen and (forced-colors: active) { + .product-form__input--pill input[type='radio']:checked + label { + text-decoration: underline; + } + + .product-form__input--pill input[type='radio']:focus-visible + label { + outline: transparent solid 1px; + outline-offset: 2px; + } +} + +.product-form__input--pill input[type='radio']:checked + label::selection { + background-color: rgba(var(--color-background), 0.3); +} + +.product-form__input--pill input[type='radio']:disabled + label, +.product-form__input--pill input[type='radio'].disabled + label { + border-color: rgba(var(--color-foreground), 0.1); + color: rgba(var(--color-foreground), 0.6); + text-decoration: line-through; +} + +.product-form__input--pill input[type='radio'].disabled:checked + label, +.product-form__input--pill input[type='radio']:disabled:checked + label { + color: rgba(var(--color-background), 0.6); +} +.product-form__input--pill input[type='radio']:focus-visible + label { + box-shadow: 0 0 0 0.3rem rgb(var(--color-background)), 0 0 0 0.5rem rgba(var(--color-foreground), 0.55); +} + +/* Fallback */ +.product-form__input--pill input[type='radio'].focused + label { + box-shadow: 0 0 0 0.3rem rgb(var(--color-background)), 0 0 0 0.5rem rgba(var(--color-foreground), 0.55); +} + +/* No outline when focus-visible is available in the browser */ +.no-js .product-form__input--pill input[type='radio']:focus:not(:focus-visible) + label { + box-shadow: none; +} +/* End custom styles for Pill display type */ + +/* Custom styles for Swatch display type */ +.product-form__input--swatch { + display: flex; + flex-wrap: wrap; +} + +.product-form__input--swatch .swatch-input__input + .swatch-input__label { + margin: 0.7rem 1.2rem 0.2rem 0; +} + +@media screen and (min-width: 750px) { + .product-form__input--swatch .swatch-input__input + .swatch-input__label { + --swatch-input--size: 2.8rem; + } +} +/* End custom styles for Swatch display type */ diff --git a/assets/component-search.css b/assets/component-search.css index 08acd4a64d9..5a04cb5e587 100644 --- a/assets/component-search.css +++ b/assets/component-search.css @@ -68,3 +68,7 @@ input::-webkit-search-decoration { -webkit-appearance: none; } + +.template-search__results { + position: relative; +} diff --git a/assets/component-slider.css b/assets/component-slider.css index 536fe288bfd..a9c911827fb 100644 --- a/assets/component-slider.css +++ b/assets/component-slider.css @@ -38,10 +38,6 @@ slider-component.slider-component-full-width { padding-bottom: 0; } -.slider__slide[aria-hidden="true"] { - visibility: hidden; -} - @media screen and (max-width: 749px) { .slider.slider--mobile { position: relative; diff --git a/assets/component-swatch-input.css b/assets/component-swatch-input.css new file mode 100644 index 00000000000..61a42b7277c --- /dev/null +++ b/assets/component-swatch-input.css @@ -0,0 +1,69 @@ +/* swatch-input lives in its own file for reusability of the swatch in other areas than the product form context */ +.swatch-input__input + .swatch-input__label { + --swatch-input--size: 4.4rem; + --swatch-input--border-radius: 50%; + + display: inline-block; + border-radius: var(--swatch-input--border-radius); + cursor: pointer; + outline-offset: 0.2rem; + forced-color-adjust: none; +} + +.swatch-input__input + .swatch-input__label.swatch-input__label--square { + --swatch-input--border-radius: 0.2rem; +} + +.swatch-input__input + .swatch-input__label:hover { + outline: 0.2rem solid rgba(var(--color-foreground), 0.4); +} + +.swatch-input__input:active + .swatch-input__label, +.swatch-input__input:checked + .swatch-input__label { + outline: 0.1rem solid rgb(var(--color-foreground)); +} + +/* Visually disabled */ +.swatch-input__input.disabled:not(:active):not(:checked) + .swatch-input__label:hover { + outline: none; +} + +/* Focus visible */ +.swatch-input__input:focus-visible + .swatch-input__label { + box-shadow: 0 0 0 0.5rem rgb(var(--color-background)), 0 0 0 0.7rem rgba(var(--color-foreground), 0.55); +} + +/* Overrides for swatch snippet when used inside disabled swatch-input */ +.swatch-input__input:disabled + .swatch-input__label > .swatch, +.swatch-input__input.disabled + .swatch-input__label > .swatch { + position: relative; + overflow: hidden; +} + +/* Display white semi-transparent overlay over swatch when input is disabled */ +.swatch-input__input:disabled + .swatch-input__label > .swatch::before, +.swatch-input__input.disabled + .swatch-input__label > .swatch::before { + content: ''; + position: absolute; + inset: 0; + background: rgba(250, 250, 250, 0.5); +} + +/* Display crossed out line over swatch when input is disabled */ +.swatch-input__input:disabled + .swatch-input__label > .swatch::after, +.swatch-input__input.disabled + .swatch-input__label > .swatch::after { + /* Diagonal of a square = length of the side * sqrt(2) */ + --diagonal--size: calc(var(--swatch-input--size) * 1.414); + --crossed-line--size: 0.1rem; + --crossed-line--color: rgb(0, 0, 0); + + content: ''; + position: absolute; + bottom: calc(var(--crossed-line--size) * -0.5); + left: 0; + width: var(--diagonal--size); + height: var(--crossed-line--size); + background-color: var(--crossed-line--color); + transform: rotate(-45deg); + transform-origin: left; +} diff --git a/assets/component-swatch.css b/assets/component-swatch.css new file mode 100644 index 00000000000..7e6d9377527 --- /dev/null +++ b/assets/component-swatch.css @@ -0,0 +1,23 @@ +/* swatch lives in its own file for reusability of the swatch in swatch-input and dropdown */ +.swatch { + --swatch--size: var(--swatch-input--size, 4.4rem); + --swatch--border-radius: var(--swatch-input--border-radius, 50%); + + display: block; + width: var(--swatch--size); + aspect-ratio: 1 / 1; + background: var(--swatch--background); + background-size: cover; + background-origin: border-box; + border: 0.1rem solid rgba(var(--color-background-contrast), 0.5); + border-radius: var(--swatch--border-radius); +} + +.swatch--square { + --swatch--border-radius: var(--swatch-input--border-radius, 0.2rem); +} + +.swatch--unavailable { + border-style: dashed; + border-color: rgba(var(--color-foreground), 0.5); +} diff --git a/assets/component-visual-display.css b/assets/component-visual-display.css new file mode 100644 index 00000000000..f683b455d7e --- /dev/null +++ b/assets/component-visual-display.css @@ -0,0 +1,90 @@ +.visual-display { + --visual-display__size: min(2.4rem, 100%); + position: relative; + width: var(--visual-display__size); + max-width: 100%; + border: 0.1rem solid rgba(var(--color-foreground), 0.2); + aspect-ratio: 1/1; +} + +.visual-display.empty { + border-style: dashed; +} + +.visual-display--presentation-swatch { + --visual-display__size: min(2.4rem, 100%); + + border-radius: 100%; + overflow: hidden; +} + +.visual-display-parent .visual-display--presentation-swatch { + outline-offset: 0.2rem; +} + +/* Hover, active, and focus states */ +:is( + .visual-display-parent:hover .visual-display--presentation-swatch, + .visual-display-parent.active .visual-display--presentation-swatch, + .visual-display-parent:has(:focus-visible) .visual-display--presentation-swatch + ) { + outline-style: solid; +} + +/* Active state */ +.visual-display-parent.active .visual-display--presentation-swatch { + outline-width: 0.2rem; + outline-color: rgb(var(--color-foreground), 1); +} + +/* Hover state */ +.visual-display-parent:hover .visual-display--presentation-swatch { + outline-width: 0.2rem; + outline-color: rgb(var(--color-foreground), 0.4); +} + +/* Focus state */ +.visual-display-parent:has(:focus-visible) .visual-display--presentation-swatch { + outline-width: 0.2rem; + outline-color: rgb(var(--color-foreground), 0.4); + box-shadow: 0 0 0 0.6rem rgb(var(--color-background)), 0 0 0 0.8rem rgba(var(--color-foreground), 0.5), + 0 0 1.2rem 0.4rem rgba(var(--color-foreground), 0.3); +} + +/* Focus state for older browsers */ +@supports not selector(:has(a, b)) { + .visual-display-parent:focus-within .visual-display--presentation-swatch { + outline-offset: 0.2rem; + outline: 0.2rem solid rgb(var(--color-foreground), 0.4); + box-shadow: 0 0 0 0.6rem rgb(var(--color-background)), 0 0 0 0.8rem rgba(var(--color-foreground), 0.5), + 0 0 1.2rem 0.4rem rgba(var(--color-foreground), 0.3); + } +} + +.visual-display-parent.disabled { + opacity: 0.4; + pointer-events: none; +} + +/* Used to display the disabled dash */ +.visual-display-parent.disabled .visual-display::after { + display: block; + content: ''; + + /* 1.414 is not a magic number, it's the square root of 2, or the length of the diagonal */ + width: calc(var(--visual-display__size) * 1.414); + border-bottom: 0.1rem solid rgb(var(--color-background-contrast)); + transform: rotate(-45deg); + transform-origin: left; +} + +.visual-display .visual-display__child { + display: block; + height: 100%; + width: 100%; + forced-color-adjust: none; +} + +.visual-display--presentation-swatch .visual-display__image { + object-fit: cover; +} diff --git a/assets/facets.js b/assets/facets.js index 21407ab5d59..f41ab17a8db 100644 --- a/assets/facets.js +++ b/assets/facets.js @@ -34,6 +34,10 @@ class FacetFiltersForm extends HTMLElement { const sections = FacetFiltersForm.getSections(); const countContainer = document.getElementById('ProductCount'); const countContainerDesktop = document.getElementById('ProductCountDesktop'); + const loadingSpinners = document.querySelectorAll( + '.facets-container .loading__spinner, facet-filters-form .loading__spinner' + ); + loadingSpinners.forEach((spinner) => spinner.classList.remove('hidden')); document.getElementById('ProductGridContainer').querySelector('.collection').classList.add('loading'); if (countContainer) { countContainer.classList.add('loading'); @@ -98,29 +102,74 @@ class FacetFiltersForm extends HTMLElement { containerDesktop.innerHTML = count; containerDesktop.classList.remove('loading'); } + const loadingSpinners = document.querySelectorAll( + '.facets-container .loading__spinner, facet-filters-form .loading__spinner' + ); + loadingSpinners.forEach((spinner) => spinner.classList.add('hidden')); } static renderFilters(html, event) { const parsedHTML = new DOMParser().parseFromString(html, 'text/html'); - - const facetDetailsElements = parsedHTML.querySelectorAll( + const facetDetailsElementsFromFetch = parsedHTML.querySelectorAll( '#FacetFiltersForm .js-filter, #FacetFiltersFormMobile .js-filter, #FacetFiltersPillsForm .js-filter' ); - const matchesIndex = (element) => { + const facetDetailsElementsFromDom = document.querySelectorAll( + '#FacetFiltersForm .js-filter, #FacetFiltersFormMobile .js-filter, #FacetFiltersPillsForm .js-filter' + ); + + // Remove facets that are no longer returned from the server + Array.from(facetDetailsElementsFromDom).forEach((currentElement) => { + if (!Array.from(facetDetailsElementsFromFetch).some(({ id }) => currentElement.id === id)) { + currentElement.remove(); + } + }); + + const matchesId = (element) => { const jsFilter = event ? event.target.closest('.js-filter') : undefined; - return jsFilter ? element.dataset.index === jsFilter.dataset.index : false; + return jsFilter ? element.id === jsFilter.id : false; }; - const facetsToRender = Array.from(facetDetailsElements).filter((element) => !matchesIndex(element)); - const countsToRender = Array.from(facetDetailsElements).find(matchesIndex); + const facetsToRender = Array.from(facetDetailsElementsFromFetch).filter((element) => !matchesId(element)); + const countsToRender = Array.from(facetDetailsElementsFromFetch).find(matchesId); + + facetsToRender.forEach((elementToRender, index) => { + const currentElement = document.getElementById(elementToRender.id); + // Element already rendered in the DOM so just update the innerHTML + if (currentElement) { + document.getElementById(elementToRender.id).innerHTML = elementToRender.innerHTML; + } else { + if (index > 0) { + const { className: previousElementClassName, id: previousElementId } = facetsToRender[index - 1]; + // Same facet type (eg horizontal/vertical or drawer/mobile) + if (elementToRender.className === previousElementClassName) { + document.getElementById(previousElementId).after(elementToRender); + return; + } + } - facetsToRender.forEach((element) => { - document.querySelector(`.js-filter[data-index="${element.dataset.index}"]`).innerHTML = element.innerHTML; + if (elementToRender.parentElement) { + document.querySelector(`#${elementToRender.parentElement.id} .js-filter`).before(elementToRender); + } + } }); FacetFiltersForm.renderActiveFacets(parsedHTML); FacetFiltersForm.renderAdditionalElements(parsedHTML); - if (countsToRender) FacetFiltersForm.renderCounts(countsToRender, event.target.closest('.js-filter')); + if (countsToRender) { + const closestJSFilterID = event.target.closest('.js-filter').id; + + if (closestJSFilterID) { + FacetFiltersForm.renderCounts(countsToRender, event.target.closest('.js-filter')); + FacetFiltersForm.renderMobileCounts(countsToRender, document.getElementById(closestJSFilterID)); + + const newFacetDetailsElement = document.getElementById(closestJSFilterID); + const newElementSelector = newFacetDetailsElement.classList.contains('mobile-facets__details') + ? `.mobile-facets__close-button` + : `.facets__summary`; + const newElementToActivate = newFacetDetailsElement.querySelector(newElementSelector); + if (newElementToActivate) newElementToActivate.focus(); + } + } } static renderActiveFacets(html) { @@ -147,18 +196,41 @@ class FacetFiltersForm extends HTMLElement { } static renderCounts(source, target) { - const targetElement = target.querySelector('.facets__selected'); - const sourceElement = source.querySelector('.facets__selected'); + const targetSummary = target.querySelector('.facets__summary'); + const sourceSummary = source.querySelector('.facets__summary'); - const targetElementAccessibility = target.querySelector('.facets__summary'); - const sourceElementAccessibility = source.querySelector('.facets__summary'); + if (sourceSummary && targetSummary) { + targetSummary.outerHTML = sourceSummary.outerHTML; + } + + const targetHeaderElement = target.querySelector('.facets__header'); + const sourceHeaderElement = source.querySelector('.facets__header'); - if (sourceElement && targetElement) { - target.querySelector('.facets__selected').outerHTML = source.querySelector('.facets__selected').outerHTML; + if (sourceHeaderElement && targetHeaderElement) { + targetHeaderElement.outerHTML = sourceHeaderElement.outerHTML; } - if (targetElementAccessibility && sourceElementAccessibility) { - target.querySelector('.facets__summary').outerHTML = source.querySelector('.facets__summary').outerHTML; + const targetWrapElement = target.querySelector('.facets-wrap'); + const sourceWrapElement = source.querySelector('.facets-wrap'); + + if (sourceWrapElement && targetWrapElement) { + const isShowingMore = Boolean(target.querySelector('show-more-button .label-show-more.hidden')); + if (isShowingMore) { + sourceWrapElement + .querySelectorAll('.facets__item.hidden') + .forEach((hiddenItem) => hiddenItem.classList.replace('hidden', 'show-more-item')); + } + + targetWrapElement.outerHTML = sourceWrapElement.outerHTML; + } + } + + static renderMobileCounts(source, target) { + const targetFacetsList = target.querySelector('.mobile-facets__list'); + const sourceFacetsList = source.querySelector('.mobile-facets__list'); + + if (sourceFacetsList && targetFacetsList) { + targetFacetsList.outerHTML = sourceFacetsList.outerHTML; } } diff --git a/assets/global.js b/assets/global.js index c04d3d37ad3..c541c6fb82e 100644 --- a/assets/global.js +++ b/assets/global.js @@ -359,8 +359,9 @@ class MenuDrawer extends HTMLElement { this.querySelectorAll('summary').forEach((summary) => summary.addEventListener('click', this.onSummaryClick.bind(this)) ); - this.querySelectorAll('button:not(.localization-selector)').forEach((button) => - button.addEventListener('click', this.onCloseButtonClick.bind(this)) + this.querySelectorAll( + 'button:not(.localization-selector):not(.country-selector__close-button):not(.country-filter__reset-button)' + ).forEach((button) => button.addEventListener('click', this.onCloseButtonClick.bind(this)) ); } @@ -958,9 +959,10 @@ class VariantSelects extends HTMLElement { this.addEventListener('change', this.onVariantChange); } - onVariantChange() { + onVariantChange(event) { this.updateOptions(); this.updateMasterId(); + this.updateSelectedSwatchValue(event); this.toggleAddButton(true, '', false); this.updatePickupAvailability(); this.removeErrorMessage(); @@ -979,7 +981,14 @@ class VariantSelects extends HTMLElement { } updateOptions() { - this.options = Array.from(this.querySelectorAll('select'), (select) => select.value); + this.options = Array.from(this.querySelectorAll('select, fieldset'), (element) => { + if (element.tagName === 'SELECT') { + return element.value; + } + if (element.tagName === 'FIELDSET') { + return Array.from(element.querySelectorAll('input')).find((radio) => radio.checked)?.value; + } + }); } updateMasterId() { @@ -992,6 +1001,26 @@ class VariantSelects extends HTMLElement { }); } + updateSelectedSwatchValue({ target }) { + const { name, value, tagName } = target; + + if (tagName === 'SELECT' && target.selectedOptions.length) { + const swatchValue = target.selectedOptions[0].dataset.optionSwatchValue; + const selectedDropdownSwatchValue = this.querySelector(`[data-selected-dropdown-swatch="${name}"] > .swatch`); + if (!selectedDropdownSwatchValue) return; + if (swatchValue) { + selectedDropdownSwatchValue.style.setProperty('--swatch--background', swatchValue); + selectedDropdownSwatchValue.classList.remove('swatch--unavailable'); + } else { + selectedDropdownSwatchValue.style.setProperty('--swatch--background', 'unset'); + selectedDropdownSwatchValue.classList.add('swatch--unavailable'); + } + } else if (tagName === 'INPUT' && target.type === 'radio') { + const selectedSwatchValue = this.querySelector(`[data-selected-swatch-value="${name}"]`); + if (selectedSwatchValue) selectedSwatchValue.innerHTML = value; + } + } + updateMedia() { if (!this.currentVariant) return; if (!this.currentVariant.featured_media) return; @@ -1045,12 +1074,17 @@ class VariantSelects extends HTMLElement { }); } - setInputAvailability(listOfOptions, listOfAvailableOptions) { - listOfOptions.forEach((input) => { - if (listOfAvailableOptions.includes(input.getAttribute('value'))) { - input.innerText = input.getAttribute('value'); - } else { - input.innerText = window.variantStrings.unavailable_with_option.replace('[value]', input.getAttribute('value')); + setInputAvailability(elementList, availableValuesList) { + elementList.forEach((element) => { + const value = element.getAttribute('value'); + const availableElement = availableValuesList.includes(value); + + if (element.tagName === 'INPUT') { + element.classList.toggle('disabled', !availableElement); + } else if (element.tagName === 'OPTION') { + element.innerText = availableElement + ? value + : window.variantStrings.unavailable_with_option.replace('[value]', value); } }); } @@ -1205,31 +1239,6 @@ class VariantSelects extends HTMLElement { customElements.define('variant-selects', VariantSelects); -class VariantRadios extends VariantSelects { - constructor() { - super(); - } - - setInputAvailability(listOfOptions, listOfAvailableOptions) { - listOfOptions.forEach((input) => { - if (listOfAvailableOptions.includes(input.getAttribute('value'))) { - input.classList.remove('disabled'); - } else { - input.classList.add('disabled'); - } - }); - } - - updateOptions() { - const fieldsets = Array.from(this.querySelectorAll('fieldset')); - this.options = fieldsets.map((fieldset) => { - return Array.from(fieldset.querySelectorAll('input')).find((radio) => radio.checked).value; - }); - } -} - -customElements.define('variant-radios', VariantRadios); - class ProductRecommendations extends HTMLElement { constructor() { super(); diff --git a/assets/localization-form.js b/assets/localization-form.js index 997a81364fe..4d532ece621 100644 --- a/assets/localization-form.js +++ b/assets/localization-form.js @@ -4,14 +4,36 @@ if (!customElements.get('localization-form')) { class LocalizationForm extends HTMLElement { constructor() { super(); + this.mql = window.matchMedia('(min-width: 750px)'); + this.header = document.querySelector('.header-wrapper'); this.elements = { input: this.querySelector('input[name="locale_code"], input[name="country_code"]'), - button: this.querySelector('button'), + button: this.querySelector('button.localization-form__select'), panel: this.querySelector('.disclosure__list-wrapper'), + search: this.querySelector('input[name="country_filter"]'), + closeButton: this.querySelector('.country-selector__close-button'), + resetButton: this.querySelector('.country-filter__reset-button'), + searchIcon: this.querySelector('.country-filter__search-icon'), + liveRegion: this.querySelector('#sr-country-search-results'), }; - this.elements.button.addEventListener('click', this.openSelector.bind(this)); - this.elements.button.addEventListener('focusout', this.closeSelector.bind(this)); this.addEventListener('keyup', this.onContainerKeyUp.bind(this)); + this.addEventListener('keydown', this.onContainerKeyDown.bind(this)); + this.addEventListener('focusout', this.closeSelector.bind(this)); + this.elements.button.addEventListener('click', this.openSelector.bind(this)); + + if (this.elements.search) { + this.elements.search.addEventListener('keyup', this.filterCountries.bind(this)); + this.elements.search.addEventListener('focus', this.onSearchFocus.bind(this)); + this.elements.search.addEventListener('blur', this.onSearchBlur.bind(this)); + this.elements.search.addEventListener('keydown', this.onSearchKeyDown.bind(this)); + } + if (this.elements.closeButton) { + this.elements.closeButton.addEventListener('click', this.hidePanel.bind(this)); + } + if (this.elements.resetButton) { + this.elements.resetButton.addEventListener('click', this.resetFilter.bind(this)); + this.elements.resetButton.addEventListener('mousedown', (event) => event.preventDefault()); + } this.querySelectorAll('a').forEach((item) => item.addEventListener('click', this.onItemClick.bind(this))); } @@ -19,15 +41,65 @@ if (!customElements.get('localization-form')) { hidePanel() { this.elements.button.setAttribute('aria-expanded', 'false'); this.elements.panel.setAttribute('hidden', true); + if (this.elements.search) { + this.elements.search.value = ''; + this.filterCountries(); + this.elements.search.setAttribute('aria-activedescendant', ''); + } + document.body.classList.remove('overflow-hidden-mobile'); + document.querySelector('.menu-drawer').classList.remove('country-selector-open'); + this.header.preventHide = false; + } + + onContainerKeyDown(event) { + const focusableItems = Array.from(this.querySelectorAll('a')).filter( + (item) => !item.parentElement.classList.contains('hidden') + ); + let focusedItemIndex = focusableItems.findIndex((item) => item === document.activeElement); + let itemToFocus; + + switch (event.code.toUpperCase()) { + case 'ARROWUP': + event.preventDefault(); + itemToFocus = + focusedItemIndex > 0 ? focusableItems[focusedItemIndex - 1] : focusableItems[focusableItems.length - 1]; + itemToFocus.focus(); + break; + case 'ARROWDOWN': + event.preventDefault(); + itemToFocus = + focusedItemIndex < focusableItems.length - 1 ? focusableItems[focusedItemIndex + 1] : focusableItems[0]; + itemToFocus.focus(); + break; + } + + if (!this.elements.search) return; + + setTimeout(() => { + focusedItemIndex = focusableItems.findIndex((item) => item === document.activeElement); + if (focusedItemIndex > -1) { + this.elements.search.setAttribute('aria-activedescendant', focusableItems[focusedItemIndex].id); + } else { + this.elements.search.setAttribute('aria-activedescendant', ''); + } + }); } onContainerKeyUp(event) { - if (event.code.toUpperCase() !== 'ESCAPE') return; + event.preventDefault(); - if (this.elements.button.getAttribute('aria-expanded') == 'false') return; - this.hidePanel(); - event.stopPropagation(); - this.elements.button.focus(); + switch (event.code.toUpperCase()) { + case 'ESCAPE': + if (this.elements.button.getAttribute('aria-expanded') == 'false') return; + this.hidePanel(); + event.stopPropagation(); + this.elements.button.focus(); + break; + case 'SPACE': + if (this.elements.button.getAttribute('aria-expanded') == 'true') return; + this.openSelector(); + break; + } } onItemClick(event) { @@ -44,15 +116,84 @@ if (!customElements.get('localization-form')) { 'aria-expanded', (this.elements.button.getAttribute('aria-expanded') === 'false').toString() ); + if (!document.body.classList.contains('overflow-hidden-tablet')) { + document.body.classList.add('overflow-hidden-mobile'); + } + if (this.elements.search && this.mql.matches) { + this.elements.search.focus(); + } + if (this.hasAttribute('data-prevent-hide')) { + this.header.preventHide = true; + } + document.querySelector('.menu-drawer').classList.add('country-selector-open'); } closeSelector(event) { - const isChild = - this.elements.panel.contains(event.relatedTarget) || this.elements.button.contains(event.relatedTarget); - if (!event.relatedTarget || !isChild) { + if ( + event.target.classList.contains('country-selector__overlay') || + !this.contains(event.target) || + !this.contains(event.relatedTarget) + ) { this.hidePanel(); } } + + filterCountries() { + const searchValue = this.elements.search.value.toLowerCase(); + const popularCountries = this.querySelector('.popular-countries'); + const allCountries = this.querySelectorAll('a'); + let visibleCountries = allCountries.length; + + this.elements.resetButton.classList.toggle('hidden', !searchValue); + + if (popularCountries) { + popularCountries.classList.toggle('hidden', searchValue); + } + + allCountries.forEach((item) => { + const countryName = item.querySelector('.country').textContent.toLowerCase(); + if (countryName.indexOf(searchValue) > -1) { + item.parentElement.classList.remove('hidden'); + visibleCountries++; + } else { + item.parentElement.classList.add('hidden'); + visibleCountries--; + } + }); + + if (this.elements.liveRegion) { + this.elements.liveRegion.innerHTML = window.accessibilityStrings.countrySelectorSearchCount.replace( + '[count]', + visibleCountries + ); + } + + this.querySelector('.country-selector').scrollTop = 0; + this.querySelector('.country-selector__list').scrollTop = 0; + } + + resetFilter(event) { + event.stopPropagation(); + this.elements.search.value = ''; + this.filterCountries(); + this.elements.search.focus(); + } + + onSearchFocus() { + this.elements.searchIcon.classList.add('country-filter__search-icon--hidden'); + } + + onSearchBlur() { + if (!this.elements.search.value) { + this.elements.searchIcon.classList.remove('country-filter__search-icon--hidden'); + } + } + + onSearchKeyDown(event) { + if (event.code.toUpperCase() === 'ENTER') { + event.preventDefault(); + } + } } ); } diff --git a/assets/magnify.js b/assets/magnify.js index 60a4f91a9c5..11359d2e1a9 100644 --- a/assets/magnify.js +++ b/assets/magnify.js @@ -25,7 +25,7 @@ function prepareOverlay(container, image) { } function toggleLoadingSpinner(image) { - const loadingSpinner = image.parentElement.parentElement.querySelector(`.loading-overlay__spinner`); + const loadingSpinner = image.parentElement.parentElement.querySelector(`.loading__spinner`); loadingSpinner.classList.toggle('hidden'); } diff --git a/assets/pickup-availability.js b/assets/pickup-availability.js index 238d77fd1fa..56c6f71fbf1 100644 --- a/assets/pickup-availability.js +++ b/assets/pickup-availability.js @@ -58,6 +58,10 @@ if (!customElements.get('pickup-availability')) { this.setAttribute('available', ''); document.body.appendChild(sectionInnerHTML.querySelector('pickup-availability-drawer')); + const colorClassesToApply = this.dataset.productPageColorScheme.split(' '); + colorClassesToApply.forEach((colorClass) => { + document.querySelector('pickup-availability-drawer').classList.add(colorClass); + }); const button = this.querySelector('button'); if (button) diff --git a/assets/product-form.js b/assets/product-form.js index 4deccf99b41..da186473160 100644 --- a/assets/product-form.js +++ b/assets/product-form.js @@ -24,7 +24,7 @@ if (!customElements.get('product-form')) { this.submitButton.setAttribute('aria-disabled', true); this.submitButton.classList.add('loading'); - this.querySelector('.loading-overlay__spinner').classList.remove('hidden'); + this.querySelector('.loading__spinner').classList.remove('hidden'); const config = fetchConfig('javascript'); config.headers['X-Requested-With'] = 'XMLHttpRequest'; @@ -66,7 +66,11 @@ if (!customElements.get('product-form')) { } if (!this.error) - publish(PUB_SUB_EVENTS.cartUpdate, { source: 'product-form', productVariantId: formData.get('id'), cartData: response }); + publish(PUB_SUB_EVENTS.cartUpdate, { + source: 'product-form', + productVariantId: formData.get('id'), + cartData: response, + }); this.error = false; const quickAddModal = this.closest('quick-add-modal'); if (quickAddModal) { @@ -91,7 +95,7 @@ if (!customElements.get('product-form')) { this.submitButton.classList.remove('loading'); if (this.cart && this.cart.classList.contains('is-empty')) this.cart.classList.remove('is-empty'); if (!this.error) this.submitButton.removeAttribute('aria-disabled'); - this.querySelector('.loading-overlay__spinner').classList.add('hidden'); + this.querySelector('.loading__spinner').classList.add('hidden'); }); } diff --git a/assets/product-info.js b/assets/product-info.js index 79a714b67ab..cbdeb9e7d57 100644 --- a/assets/product-info.js +++ b/assets/product-info.js @@ -6,7 +6,6 @@ if (!customElements.get('product-info')) { super(); this.input = this.querySelector('.quantity__input'); this.currentVariant = this.querySelector('.product-variant-id'); - this.variantSelects = this.querySelector('variant-radios'); this.submitButton = this.querySelector('[type="submit"]'); } @@ -59,7 +58,7 @@ if (!customElements.get('product-info')) { fetchQuantityRules() { if (!this.currentVariant || !this.currentVariant.value) return; - this.querySelector('.quantity__rules-cart .loading-overlay').classList.remove('hidden'); + this.querySelector('.quantity__rules-cart .loading__spinner').classList.remove('hidden'); fetch(`${this.dataset.url}?variant=${this.currentVariant.value}§ion_id=${this.dataset.section}`) .then((response) => { return response.text(); @@ -73,7 +72,7 @@ if (!customElements.get('product-info')) { console.error(e); }) .finally(() => { - this.querySelector('.quantity__rules-cart .loading-overlay').classList.add('hidden'); + this.querySelector('.quantity__rules-cart .loading__spinner').classList.add('hidden'); }); } diff --git a/assets/quantity-popover.css b/assets/quantity-popover.css index 3173a685a60..f7b0c87c987 100644 --- a/assets/quantity-popover.css +++ b/assets/quantity-popover.css @@ -161,4 +161,4 @@ quantity-popover .quantity__rules .divider:nth-child(2)::before { quantity-popover .quantity__button:not(:focus-visible):not(.focused), quantity-popover .quantity__input:not(:focus-visible):not(.focused) { background-color: initial; -} +} \ No newline at end of file diff --git a/assets/quick-add.js b/assets/quick-add.js index 253b9672443..6a9d5573ce3 100644 --- a/assets/quick-add.js +++ b/assets/quick-add.js @@ -19,13 +19,17 @@ if (!customElements.get('quick-add-modal')) { show(opener) { opener.setAttribute('aria-disabled', true); opener.classList.add('loading'); - opener.querySelector('.loading-overlay__spinner').classList.remove('hidden'); + opener.querySelector('.loading__spinner').classList.remove('hidden'); fetch(opener.getAttribute('data-product-url')) .then((response) => response.text()) .then((responseText) => { const responseHTML = new DOMParser().parseFromString(responseText, 'text/html'); this.productElement = responseHTML.querySelector('section[id^="MainProduct-"]'); + this.productElement.classList.forEach((classApplied) => { + if (classApplied.startsWith('color-') || classApplied === 'gradient') + this.modalContent.classList.add(classApplied); + }); this.preventDuplicatedIDs(); this.removeDOMElements(); this.setInnerHTML(this.modalContent, this.productElement.innerHTML); @@ -44,7 +48,7 @@ if (!customElements.get('quick-add-modal')) { .finally(() => { opener.removeAttribute('aria-disabled'); opener.classList.remove('loading'); - opener.querySelector('.loading-overlay__spinner').classList.add('hidden'); + opener.querySelector('.loading__spinner').classList.add('hidden'); }); } @@ -63,7 +67,7 @@ if (!customElements.get('quick-add-modal')) { } preventVariantURLSwitching() { - const variantPicker = this.modalContent.querySelector('variant-radios,variant-selects'); + const variantPicker = this.modalContent.querySelector('variant-selects'); if (!variantPicker) return; variantPicker.setAttribute('data-update-url', 'false'); @@ -83,7 +87,7 @@ if (!customElements.get('quick-add-modal')) { preventDuplicatedIDs() { const sectionId = this.productElement.dataset.section; this.productElement.innerHTML = this.productElement.innerHTML.replaceAll(sectionId, `quickadd-${sectionId}`); - this.productElement.querySelectorAll('variant-selects, variant-radios, product-info').forEach((element) => { + this.productElement.querySelectorAll('variant-selects, product-info').forEach((element) => { element.dataset.originalSection = sectionId; }); } diff --git a/assets/quick-order-list.css b/assets/quick-order-list.css index 36aad4d3d01..a733c922ac4 100644 --- a/assets/quick-order-list.css +++ b/assets/quick-order-list.css @@ -11,10 +11,6 @@ quick-order-list .quantity__button { width: calc(3.5rem / var(--font-body-scale)); } -.quick-order-list__contents { - position: relative; -} - .quick-order-list__container { padding-bottom: 4rem; } @@ -28,10 +24,6 @@ quick-order-list .quantity__button { border-top: 0.1rem solid rgba(var(--color-foreground), .08); } -.totals__product-total { - text-align: center; -} - .variant-item__quantity .quantity:before { z-index: 0; } @@ -48,15 +40,6 @@ quick-order-list .quantity__button { background-color: rgb(var(--color-background)); } - .totals__product-total { - text-align: right; - } - - .variant__items { - max-height: 90rem; - overflow-y: auto; - } - .variant-item__quantity-wrapper--no-info, .variant-item__error { padding-left: calc(15px + 3.4rem); @@ -70,7 +53,7 @@ quick-order-list .quantity__button { vertical-align: top; } - .variant-item--unit-price .variant-item__totals .loading-overlay { + .variant-item--unit-price .variant-item__totals .loading__spinner { padding-top: 1.7rem; } } @@ -142,10 +125,6 @@ quick-order-list .quantity__button { display: flex; } - .quick-order-list__table .variant-item__inner.variant-item__inner--no-sku { - vertical-align: middle; - } - .variant-item__discounted-prices { justify-content: flex-end; } @@ -161,7 +140,6 @@ quick-order-list .quantity__button { max-width: 30rem; } - .variant-item__info { position: relative; padding-bottom: 0.5rem; @@ -208,12 +186,6 @@ quick-order-list .quantity__button { font-weight: 400; } -.product-option { - font-size: 1.4rem; - word-break: break-word; - line-height: calc(1 + 0.5 / var(--font-body-scale)); -} - .variant-item__sold-out { opacity: 0.7; font-size: 1.6rem; @@ -222,7 +194,7 @@ quick-order-list .quantity__button { quick-order-list-remove-button { display: flex; - margin-left: 1rem; + margin: 0 0 0 1.2rem; align-self: center; } @@ -242,14 +214,7 @@ quick-order-list-remove-button { margin-top: 1rem; } - .quick-order-list-buttons { - display: flex; - justify-content: space-between; - flex-direction: column; - } - .quick-order-list-total__column { - display: flex; flex-wrap: wrap; } @@ -266,25 +231,17 @@ quick-order-list-remove-button .button { margin: 0 0.1rem 0.1rem 0; } - quick-order-list-remove-button .button:not([disabled]):hover { color: rgb(var(--color-foreground)); } -@media screen and (min-width: 990px) { - quick-order-list-remove-button .button { - min-width: 1.5rem; - min-height: 1.5rem; - } -} - quick-order-list-remove-button .icon-remove { height: 1.5rem; width: 1.5rem; transition: transform var(--duration-default) ease; } -.variant-item .loading-overlay { +.variant-item .loading__spinner { top: 0; left: auto; right: 0; @@ -292,6 +249,11 @@ quick-order-list-remove-button .icon-remove { padding: 0; } +.variant-remove-total { + position: relative; + align-self: center; +} + .variant-remove-total .button--tertiary { width: max-content; } @@ -302,16 +264,16 @@ quick-order-list-remove-button .icon-remove { margin-right: 0.8rem; } -.quick-order-list__message svg { - margin-right: 1rem; - width: 1.3rem; -} - .quick-order-list__message { margin-top: 1rem; display: block; } +.quick-order-list__message svg { + margin-right: 1rem; + width: 1.3rem; +} + .quick-order-list-error { margin-top: 1rem; display: flex; @@ -326,16 +288,16 @@ quick-order-list-remove-button .icon-remove { } @media screen and (min-width: 990px) { - .variant-item .loading-overlay { + .variant-item .loading__spinner { padding-top: 3rem; bottom: auto; } - .variant-item .loading-overlay--error { + .variant-item .loading__spinner--error { padding-top: 5rem; } - .variant-remove-total .loading-overlay { + .variant-remove-total .loading__spinner { left: 2rem; top: 1.2rem; } @@ -355,8 +317,8 @@ quick-order-list-remove-button:hover .icon-remove { align-self: center; } -.variant-item .loading-overlay:not(.hidden)~*, -.variant-remove-total .loading-overlay:not(.hidden)~* { +.variant-item .loading__spinner:not(.hidden)~*, +.variant-remove-total .loading__spinner:not(.hidden)~* { visibility: hidden; } @@ -385,15 +347,6 @@ quick-order-list-remove-button:hover .icon-remove { display: none; } -.product-option+.product-option { - margin-top: 0.4rem; -} - -.product-option * { - display: inline; - margin: 0; -} - .quick-order-list__table thead th { text-transform: uppercase; } @@ -408,7 +361,7 @@ quick-order-list-remove-button:hover .icon-remove { align-items: center; } - .variant-item__details .loading-overlay { + .variant-item__details .loading__spinner { left: 0; top: auto; } @@ -472,17 +425,12 @@ quick-order-list-remove-button:hover .icon-remove { text-align: center; } - .quick-order-list-total__column { + .quick-order-list-total__column, + .quick-order-list-buttons { display: flex; flex-direction: column; align-items: center; - } - - .quick-order-list-buttons { width: 100%; - align-items: center; - display: flex; - flex-direction: column; } .quick-order-list__button { @@ -497,10 +445,6 @@ quick-order-list-remove-button:hover .icon-remove { margin-top: -2rem; } -.quick-order-list-total__confirmation .button--tertirary { - margin-left: 2rem; -} - @media screen and (min-width: 990px) { .quick-order-list__table { border-spacing: 0; @@ -514,10 +458,6 @@ quick-order-list-remove-button:hover .icon-remove { border-bottom: 0.1rem solid rgba(var(--color-foreground), 0.08); } - .quick-order-list__table thead th:first-child { - width: 20%; - } - .quick-order-list__table th+th { padding-left: 5.4rem; } @@ -529,7 +469,6 @@ quick-order-list-remove-button:hover .icon-remove { .quick-order-list__table td { padding-top: 1.6rem; - vertical-align: middle; } .quick-order-list__table .desktop-row-error td { @@ -537,8 +476,7 @@ quick-order-list-remove-button:hover .icon-remove { } .quick-order-list__table .variant-item--unit-price td { - vertical-align: top; - + vertical-align: middle; } .variant-item { @@ -559,10 +497,6 @@ quick-order-list-remove-button:hover .icon-remove { margin-right: 3rem; } - .quick-order-list-total__column { - width: 20%; - } - .quick-order-list__total-items { width: calc(((11rem / var(--font-body-scale) + var(--inputs-border-width) * 2))); margin-left: calc(15px + 3.4rem); @@ -570,26 +504,14 @@ quick-order-list-remove-button:hover .icon-remove { } } -quick-order-list-remove-button { - margin: 0 0 0 1.2rem; -} - @media screen and (min-width: 990px) { - .variant-item .variant-item__quantity { - padding-left: 0; - } - - .quick-order-list__table thead th:first-child { - width: 37%; - } - + .quick-order-list__table thead th:first-child, .quick-order-list-total__column { width: 37%; } .quick-order-list-buttons { display: flex; - align-self: flex-start; } quick-order-list-remove-all-button { @@ -629,21 +551,13 @@ quick-order-list-remove-button { min-height: 10rem; } -.quick-order-list-total { - padding-top: 2rem; - border-top: 0.1rem solid rgba(var(--color-foreground), .08); -} - .quick-order-list-total__price { display: flex; flex-wrap: wrap; justify-content: flex-end; - width: min-content; -} - -.quick-order-list-total__price { flex-grow: 1; text-align: right; + width: min-content; } .quick-order-list-total__price .button { @@ -660,7 +574,6 @@ quick-order-list-remove-button { .totals__product-total { display: flex; justify-content: center; - text-align: center; width: 100%; align-items: center; padding-bottom: 2rem; @@ -680,7 +593,7 @@ quick-order-list-remove-button { margin-bottom: 2rem; } - .quick-order-list-total__confirmation quick-order-list-remove-all-button.button { + .quick-order-list-total__confirmation quick-order-list-remove-all-button button { margin-top: 1rem; } @@ -689,22 +602,18 @@ quick-order-list-remove-button { margin-top: 2rem; } - .quick-order-list-total__column { - width: 100%; - } - .quick-order-list__button-confirm { width: 100%; max-width: 36rem; } quick-order-list .tax-note { - text-align: center + text-align: center; } } quick-order-list .tax-note { - margin-bottom: 2rem; + margin: 0 0 2rem; display: block; width: 100%; } diff --git a/assets/quick-order-list.js b/assets/quick-order-list.js index 7a597594774..68171d17df8 100644 --- a/assets/quick-order-list.js +++ b/assets/quick-order-list.js @@ -180,7 +180,7 @@ class QuickOrderList extends HTMLElement { } updateMultipleQty(items) { - this.querySelector('.variant-remove-total .loading-overlay').classList.remove('hidden'); + this.querySelector('.variant-remove-total .loading__spinner').classList.remove('hidden'); const body = JSON.stringify({ updates: items, @@ -202,7 +202,7 @@ class QuickOrderList extends HTMLElement { this.setErrorMessage(window.cartStrings.error); }) .finally(() => { - this.querySelector('.variant-remove-total .loading-overlay').classList.add('hidden'); + this.querySelector('.variant-remove-total .loading__spinner').classList.add('hidden'); }); } @@ -245,8 +245,8 @@ class QuickOrderList extends HTMLElement { const items = document.querySelectorAll('.variant-item'); if (parsedState.description || parsedState.errors) { - const variantItem = document.querySelector(`[id^="Variant-${id}"] .variant-item__totals.small-hide .loading-overlay`); - variantItem.classList.add('loading-overlay--error'); + const variantItem = document.querySelector(`[id^="Variant-${id}"] .variant-item__totals.small-hide .loading__spinner`); + variantItem.classList.add('loading__spinner--error'); this.resetQuantityInput(id, quantityElement); if (parsedState.errors) { this.updateLiveRegions(id, parsedState.errors); @@ -285,7 +285,7 @@ class QuickOrderList extends HTMLElement { this.updateMessage(-parseInt(quantityElement.dataset.cartQuantity)) } }).catch((error) => { - this.querySelectorAll('.loading-overlay').forEach((overlay) => overlay.classList.add('hidden')); + this.querySelectorAll('.loading__spinner').forEach((overlay) => overlay.classList.add('hidden')); this.resetQuantityInput(id); console.error(error); this.setErrorMessage(window.cartStrings.error); @@ -375,7 +375,7 @@ class QuickOrderList extends HTMLElement { toggleLoading(id, enable) { const quickOrderList = document.getElementById(this.quickOrderListId); - const quickOrderListItems = this.querySelectorAll(`#Variant-${id} .loading-overlay`); + const quickOrderListItems = this.querySelectorAll(`#Variant-${id} .loading__spinner`); if (enable) { quickOrderList.classList.add('quick-order-list__container--disabled'); diff --git a/assets/section-footer.css b/assets/section-footer.css index 97a564ed6c8..9691474db6c 100644 --- a/assets/section-footer.css +++ b/assets/section-footer.css @@ -2,7 +2,7 @@ border-top: 0.1rem solid rgba(var(--color-foreground), 0.08); } -.footer:not(.color-background-1) { +.footer:not(.color-scheme-1) { border-top: none; } @@ -68,6 +68,12 @@ row-gap: 1.5rem; justify-content: center; } + + .footer__content-bottom.scroll-trigger.animate--slide-in { + animation: none; + opacity: 1; + transform: inherit; + } } .footer__localization:empty + .footer__column--info { diff --git a/assets/section-image-banner.css b/assets/section-image-banner.css index a5a2c548aef..355c9e277ca 100644 --- a/assets/section-image-banner.css +++ b/assets/section-image-banner.css @@ -2,6 +2,8 @@ display: flex; position: relative; flex-direction: column; + z-index: auto; + isolation: isolate; } .banner__box { @@ -331,7 +333,7 @@ } .banner:not(.banner--mobile-bottom) .field__input, - .banner--mobile-bottom:not(.banner--stacked) .banner__box.color-background-1 { + .banner--mobile-bottom:not(.banner--stacked) .banner__box.color-scheme-1 { background: transparent; } } diff --git a/assets/section-main-product.css b/assets/section-main-product.css index ddebf7660d9..5fb37df78e9 100644 --- a/assets/section-main-product.css +++ b/assets/section-main-product.css @@ -146,16 +146,18 @@ .product-form__error-message-wrapper:not([hidden]) { display: flex; align-items: flex-start; - font-size: 1.2rem; + font-size: 1.3rem; + line-height: 1.4; + letter-spacing: 0.04rem; margin-bottom: 1.5rem; } .product-form__error-message-wrapper svg { flex-shrink: 0; - width: 1.2rem; - height: 1.2rem; + width: 1.5rem; + height: 1.5rem; margin-right: 0.7rem; - margin-top: 0.5rem; + margin-top: 0.25rem; } /* Form Elements */ @@ -168,113 +170,18 @@ border: none; } -variant-radios, -variant-selects { - display: block; -} - -.product-form__input--dropdown { - margin-bottom: 1.6rem; -} - .product-form__input .form__label { padding-left: 0; } -fieldset.product-form__input .form__label { - margin-bottom: 0.2rem; -} - -.product-form__input input[type='radio'] { - clip: rect(0, 0, 0, 0); - overflow: hidden; - position: absolute; - height: 1px; - width: 1px; -} - -.product-form__input input[type='radio'] + label { - border: var(--variant-pills-border-width) solid rgba(var(--color-foreground), var(--variant-pills-border-opacity)); - background-color: rgb(var(--color-background)); - color: rgba(var(--color-foreground)); - border-radius: var(--variant-pills-radius); - color: rgb(var(--color-foreground)); - display: inline-block; - margin: 0.7rem 0.5rem 0.2rem 0; - padding: 1rem 2rem; - font-size: 1.4rem; - letter-spacing: 0.1rem; - line-height: 1; - text-align: center; - transition: border var(--duration-short) ease; - cursor: pointer; - position: relative; -} - -.product-form__input input[type='radio'] + label:before { - content: ''; - position: absolute; - top: calc(var(--variant-pills-border-width) * -1); - right: calc(var(--variant-pills-border-width) * -1); - bottom: calc(var(--variant-pills-border-width) * -1); - left: calc(var(--variant-pills-border-width) * -1); - z-index: -1; - border-radius: var(--variant-pills-radius); - box-shadow: var(--variant-pills-shadow-horizontal-offset) var(--variant-pills-shadow-vertical-offset) - var(--variant-pills-shadow-blur-radius) rgba(var(--color-shadow), var(--variant-pills-shadow-opacity)); -} - -.product-form__input input[type='radio'] + label:hover { - border-color: rgb(var(--color-foreground)); -} - -.product-form__input input[type='radio']:checked + label { - background-color: rgb(var(--color-foreground)); - color: rgb(var(--color-background)); -} - -.product-form__input input[type='radio']:not(.disabled) + label > .visually-hidden { - display: none; -} - -@media screen and (forced-colors: active) { - .product-form__input input[type='radio']:checked + label { - text-decoration: underline; - } -} - -.product-form__input input[type='radio']:checked + label::selection { - background-color: rgba(var(--color-background), 0.3); -} - -.product-form__input input[type='radio']:disabled + label, -.product-form__input input[type='radio'].disabled + label { - border-color: rgba(var(--color-foreground), 0.1); - color: rgba(var(--color-foreground), 0.6); - text-decoration: line-through; -} - -.product-form__input input[type='radio'].disabled:checked + label, -.product-form__input input[type='radio']:disabled:checked + label { - color: rgba(var(--color-background), 0.6); -} -.product-form__input input[type='radio']:focus-visible + label { - box-shadow: 0 0 0 0.3rem rgb(var(--color-background)), 0 0 0 0.5rem rgba(var(--color-foreground), 0.55); -} /* Fallback */ -.product-form__input input[type='radio'].focused + label, .no-js .shopify-payment-button__button [role='button']:focus + label { box-shadow: 0 0 0 0.3rem rgb(var(--color-background)), 0 0 0 0.5rem rgba(var(--color-foreground), 0.55); } -/* No outline when focus-visible is available in the browser */ -.no-js .product-form__input input[type='radio']:focus:not(:focus-visible) + label { - box-shadow: none; -} - .product-form__input .select { - max-width: 25rem; + max-width: 100%; } .product-form__submit { @@ -422,9 +329,7 @@ a.product__text { max-width: 100%; } -.product--no-media fieldset.product-form__input, .product--no-media .product-form__quantity, -.product--no-media .product-form__input--dropdown, .product--no-media .share-button, .product--no-media .product__view-details, .product--no-media .product__pickup-availabilities, @@ -444,8 +349,7 @@ a.product__text { width: 100%; } -.product--no-media .product-form__quantity, -.product--no-media .product-form__input--dropdown { +.product--no-media .product-form__quantity { flex-direction: column; max-width: 100%; } @@ -462,11 +366,6 @@ a.product__text { margin-bottom: 1.2rem; } -.product--no-media fieldset.product-form__input { - flex-wrap: wrap; - margin: 0 auto 1.2rem auto; -} - .product-form__buttons { max-width: 44rem; } @@ -695,8 +594,7 @@ a.product__text { /* outline styling for Windows High Contrast Mode */ @media (forced-colors: active) { .product__media-toggle:focus-visible, - .product__media-toggle:focus-visible:after, - .product-form__input input[type='radio']:focus-visible + label { + .product__media-toggle:focus-visible:after { outline: transparent solid 1px; outline-offset: 2px; } @@ -1165,7 +1063,7 @@ a.product__text { display: none; } -.product__modal-opener > .loading-overlay__spinner { +.product__modal-opener > .loading__spinner { top: 50%; left: 50%; transform: translate(-50%, -50%); diff --git a/assets/section-multicolumn.css b/assets/section-multicolumn.css index 29aa27168dc..ac843b7e967 100644 --- a/assets/section-multicolumn.css +++ b/assets/section-multicolumn.css @@ -14,7 +14,9 @@ .multicolumn .title-wrapper-with-link { margin-bottom: 3rem; } +} +@media screen and (max-width: 989px) { .multicolumn .page-width { padding-left: 0; padding-right: 0; @@ -110,6 +112,13 @@ } } +@media screen and (min-width: 750px) and (max-width: 989px) { + .multicolumn-list:not(.slider) { + padding-left: 5rem; + padding-right: 5rem; + } +} + @media screen and (min-width: 750px) { .multicolumn-list.slider, .multicolumn-list.grid--4-col-desktop { diff --git a/assets/template-collection.css b/assets/template-collection.css index b55af5c8f3c..b8205194add 100644 --- a/assets/template-collection.css +++ b/assets/template-collection.css @@ -11,6 +11,25 @@ } } +.collection .loading-overlay { + position: absolute; + z-index: 1; + width: 1.8rem; +} + +@media screen and (max-width: 749px) { + .collection .loading-overlay { + top: 0; + right: 0; + } +} + +@media screen and (min-width: 750px) { + .collection .loading-overlay { + left: 0; + } +} + .collection .loading-overlay { top: 0; right: 0; diff --git a/config/settings_data.json b/config/settings_data.json index 1feccea7ae2..0f7a06db992 100644 --- a/config/settings_data.json +++ b/config/settings_data.json @@ -4,7 +4,7 @@ "Default": { "logo_width": 90, "color_schemes": { - "background-1": { + "scheme-1": { "settings": { "background": "#FFFFFF", "background_gradient": "", @@ -15,7 +15,7 @@ "shadow": "#121212" } }, - "background-2": { + "scheme-2": { "settings": { "background": "#F3F3F3", "background_gradient": "", @@ -26,7 +26,7 @@ "shadow": "#121212" } }, - "inverse": { + "scheme-3": { "settings": { "background": "#242833", "background_gradient": "", @@ -37,7 +37,7 @@ "shadow": "#121212" } }, - "accent-1": { + "scheme-4": { "settings": { "background": "#121212", "background_gradient": "", @@ -48,7 +48,7 @@ "shadow": "#121212" } }, - "accent-2": { + "scheme-5": { "settings": { "background": "#334FB4", "background_gradient": "", @@ -92,7 +92,7 @@ "card_style": "standard", "card_image_padding": 0, "card_text_alignment": "left", - "card_color_scheme": "background-2", + "card_color_scheme": "scheme-2", "card_border_thickness": 0, "card_border_opacity": 10, "card_corner_radius": 0, @@ -103,7 +103,7 @@ "collection_card_style": "standard", "collection_card_image_padding": 0, "collection_card_text_alignment": "left", - "collection_card_color_scheme": "background-2", + "collection_card_color_scheme": "scheme-2", "collection_card_border_thickness": 0, "collection_card_border_opacity": 10, "collection_card_corner_radius": 0, @@ -114,7 +114,7 @@ "blog_card_style": "standard", "blog_card_image_padding": 0, "blog_card_text_alignment": "left", - "blog_card_color_scheme": "background-2", + "blog_card_color_scheme": "scheme-2", "blog_card_border_thickness": 0, "blog_card_border_opacity": 10, "blog_card_corner_radius": 0, @@ -151,8 +151,8 @@ "drawer_shadow_blur": 5, "badge_position": "bottom left", "badge_corner_radius": 40, - "sale_badge_color_scheme": "accent-2", - "sold_out_badge_color_scheme": "inverse", + "sale_badge_color_scheme": "scheme-5", + "sold_out_badge_color_scheme": "scheme-3", "social_twitter_link": "", "social_facebook_link": "", "social_pinterest_link": "", @@ -174,13 +174,13 @@ "main-password-header": { "type": "main-password-header", "settings": { - "color_scheme": "background-1" + "color_scheme": "scheme-1" } }, "main-password-footer": { "type": "main-password-footer", "settings": { - "color_scheme": "background-1" + "color_scheme": "scheme-1" } } } diff --git a/config/settings_schema.json b/config/settings_schema.json index 27f904f371c..4b30279b1ab 100644 --- a/config/settings_schema.json +++ b/config/settings_schema.json @@ -2,7 +2,7 @@ { "name": "theme_info", "theme_name": "Dawn", - "theme_version": "11.0.0", + "theme_version": "12.0.0", "theme_author": "Shopify", "theme_documentation_url": "https://help.shopify.com/manual/online-store/themes", "theme_support_url": "https://support.shopify.com/" @@ -539,7 +539,7 @@ "type": "color_scheme", "id": "card_color_scheme", "label": "t:sections.all.colors.label", - "default": "background-2" + "default": "scheme-2" }, { "type": "header", @@ -674,7 +674,7 @@ "type": "color_scheme", "id": "collection_card_color_scheme", "label": "t:sections.all.colors.label", - "default": "background-2" + "default": "scheme-2" }, { "type": "header", @@ -809,7 +809,7 @@ "type": "color_scheme", "id": "blog_card_color_scheme", "label": "t:sections.all.colors.label", - "default": "background-2" + "default": "scheme-2" }, { "type": "header", @@ -1258,13 +1258,13 @@ "type": "color_scheme", "id": "sale_badge_color_scheme", "label": "t:settings_schema.badges.settings.sale_badge_color_scheme.label", - "default": "accent-2" + "default": "scheme-5" }, { "type": "color_scheme", "id": "sold_out_badge_color_scheme", "label": "t:settings_schema.badges.settings.sold_out_badge_color_scheme.label", - "default": "inverse" + "default": "scheme-3" } ] }, @@ -1457,6 +1457,12 @@ "id": "cart_drawer_collection", "label": "t:settings_schema.cart.settings.cart_drawer.collection.label", "info": "t:settings_schema.cart.settings.cart_drawer.collection.info" + }, + { + "type": "color_scheme", + "id": "cart_color_scheme", + "label": "t:sections.all.colors.label", + "default": "scheme-1" } ] } diff --git a/layout/theme.liquid b/layout/theme.liquid index 1e98e6c18cf..786ac69eca2 100644 --- a/layout/theme.liquid +++ b/layout/theme.liquid @@ -62,7 +62,21 @@ {% else %} --gradient-background: {{ scheme.settings.background }}; {% endif %} + + {% liquid + assign background_color = scheme.settings.background + assign background_color_brightness = background_color | color_brightness + if background_color_brightness <= 26 + assign background_color_contrast = background_color | color_lighten: 50 + elsif background_color_brightness <= 65 + assign background_color_contrast = background_color | color_lighten: 5 + else + assign background_color_contrast = background_color | color_darken: 25 + endif + %} + --color-foreground: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; + --color-background-contrast: {{ background_color_contrast.red }},{{ background_color_contrast.green }},{{ background_color_contrast.blue }}; --color-shadow: {{ scheme.settings.shadow.red }},{{ scheme.settings.shadow.green }},{{ scheme.settings.shadow.blue }}; --color-button: {{ scheme.settings.button.red }},{{ scheme.settings.button.green }},{{ scheme.settings.button.blue }}; --color-button-text: {{ scheme.settings.button_label.red }},{{ scheme.settings.button_label.green }},{{ scheme.settings.button_label.blue }}; @@ -328,6 +342,7 @@ playSlideshow: `{{ 'sections.slideshow.play_slideshow' | t }}`, recipientFormExpanded: `{{ 'recipient.form.expanded' | t }}`, recipientFormCollapsed: `{{ 'recipient.form.collapsed' | t }}`, + countrySelectorSearchCount: `{{ 'localization.country_results_count' | t: count: '[count]' }}`, }; diff --git a/locales/bg-BG.json b/locales/bg-BG.json index 910661fb346..55c1b754a1b 100644 --- a/locales/bg-BG.json +++ b/locales/bg-BG.json @@ -206,7 +206,8 @@ "clear_filter": "Премахване на филтъра", "filter_selected_accessibility": "{{ type }} ({{ count }} избрани филтъра)", "show_more": "Покажи повече", - "show_less": "Покажи по-малко" + "show_less": "Покажи по-малко", + "filter_and_operator_subtitle": "Изрявняване за всички" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Държава/регион", "language_label": "Език", "update_language": "Актуализиране на езика", - "update_country": "Актуализиране на държава/регион" + "update_country": "Актуализиране на държава/регион", + "search": "Търсене", + "popular_countries_regions": "Популярни страни/региони", + "country_results_count": "Открити са {{ count }} страни/региона" }, "customer": { "account_fallback": "Профил", diff --git a/locales/cs.json b/locales/cs.json index 97a53661313..4c646f2d05e 100644 --- a/locales/cs.json +++ b/locales/cs.json @@ -214,7 +214,8 @@ "clear_filter": "Odebrat filtr", "filter_selected_accessibility": "{{ type }} (počet vybraných filtrů: {{ count }})", "show_more": "Zobrazit více", - "show_less": "Zobrazit méně" + "show_less": "Zobrazit méně", + "filter_and_operator_subtitle": "Shoda se všemi kritérii" } }, "templates": { @@ -388,7 +389,10 @@ "country_label": "Země/oblast", "language_label": "Jazyk", "update_language": "Aktualizovat jazyk", - "update_country": "Aktualizovat zemi/oblast" + "update_country": "Aktualizovat zemi/oblast", + "search": "Začněte hledat", + "popular_countries_regions": "Oblíbené země/oblasti", + "country_results_count": "Byl nalezen tento počet zemí/oblastí: {{ count }}" }, "customer": { "account": { @@ -506,7 +510,7 @@ "subtext": "Vaše dárková karta", "gift_card_code": "Kód dárkové karty", "shop_link": "Navštívit online obchod", - "add_to_apple_wallet": "Přidat do Apple Wallet", + "add_to_apple_wallet": "Přidat do Apple Peněženky", "qr_image_alt": "QR kód: po naskenování můžete uplatnit svou dárkovou kartu", "copy_code": "Zkopírovat kód dárkové karty", "expired": "Platnost vypršela", diff --git a/locales/cs.schema.json b/locales/cs.schema.json index f6b14ce0c7b..98b850f782b 100644 --- a/locales/cs.schema.json +++ b/locales/cs.schema.json @@ -1637,16 +1637,29 @@ "name": "Selektor množství" }, "variant_picker": { - "name": "Výběr varianty", + "name": "Selektor variant", "settings": { "picker_type": { - "label": "Typ", + "label": "Styl", "options__1": { "label": "Rozevírací nabídka" }, "options__2": { "label": "Kulaté přepínače" } + }, + "swatch_shape": { + "label": "Vzorník", + "info": "Zjistit, jak zobrazit [vzorníky](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Kruh" + }, + "options__2": { + "label": "Čtverec" + }, + "options__3": { + "label": "Žádný" + } } } }, @@ -2479,16 +2492,29 @@ "name": "Selektor množství" }, "variant_picker": { - "name": "Výběr varianty", + "name": "Selektor variant", "settings": { "picker_type": { - "label": "Typ", + "label": "Styl", "options__1": { "label": "Rozevírací nabídka" }, "options__2": { "label": "Kulaté přepínače" } + }, + "swatch_shape": { + "label": "Vzorník", + "info": "Zjistit, jak zobrazit [vzorníky](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Kruh" + }, + "options__2": { + "label": "Čtverec" + }, + "options__3": { + "label": "Žádný" + } } } }, diff --git a/locales/da.json b/locales/da.json index 914a8452bd8..2cca53dd5f2 100644 --- a/locales/da.json +++ b/locales/da.json @@ -17,7 +17,7 @@ "share_on_pinterest": "Pin på Pinterest" }, "links": { - "twitter": "Twitter", + "twitter": "X", "facebook": "Facebook", "pinterest": "Pinterest", "instagram": "Instagram", @@ -206,7 +206,8 @@ "clear_filter": "Fjern filter", "filter_selected_accessibility": "{{ type }} ({{ count }} filtre er valgt)", "show_more": "Vis mere", - "show_less": "Vis mindre" + "show_less": "Vis mindre", + "filter_and_operator_subtitle": "Match alle" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Land/område", "language_label": "Sprog", "update_language": "Opdater sprog", - "update_country": "Opdater land/område" + "update_country": "Opdater land/område", + "search": "Søg", + "popular_countries_regions": "Populære lande/områder", + "country_results_count": "{{ count }} lande/områder er fundet" }, "customer": { "account": { diff --git a/locales/da.schema.json b/locales/da.schema.json index 75d9417f1c3..690b1b22cc9 100644 --- a/locales/da.schema.json +++ b/locales/da.schema.json @@ -56,7 +56,7 @@ "name": "Sociale medier", "settings": { "social_twitter_link": { - "label": "Twitter", + "label": "X", "info": "https://twitter.com/shopify" }, "social_facebook_link": { @@ -900,7 +900,7 @@ }, "header__9": { "content": "Følg på Shop", - "info": "Hvis du vil give kunder mulighed for at følge din butik i Shop-appen via din butiksfacade, skal du have aktiveret Shop Pay. [Få mere at vide](https://help.shopify.com/manual/online-store/themes/customizing-themes/follow-on-shop)" + "info": "Hvis du vil give kunder mulighed for at følge din butik i Shop-appen via dit butikslayout, skal du have aktiveret Shop Pay. [Få mere at vide](https://help.shopify.com/manual/online-store/themes/customizing-themes/follow-on-shop)" }, "enable_follow_on_shop": { "label": "Aktivér Følg på Shop" @@ -1640,13 +1640,26 @@ "name": "Variantvælger", "settings": { "picker_type": { - "label": "Type", + "label": "Stil", "options__1": { "label": "Rullemenu" }, "options__2": { "label": "Etiketter" } + }, + "swatch_shape": { + "label": "Prøve", + "info": "Se, hvordan du viser [prøver](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Cirkel" + }, + "options__2": { + "label": "Kvadrat" + }, + "options__3": { + "label": "Ingen" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Variantvælger", "settings": { "picker_type": { - "label": "Type", + "label": "Stil", "options__1": { "label": "Rullemenu" }, "options__2": { "label": "Etiketter" } + }, + "swatch_shape": { + "label": "Prøve", + "info": "Se, hvordan du viser [prøver](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Cirkel" + }, + "options__2": { + "label": "Kvadrat" + }, + "options__3": { + "label": "Ingen" + } } } }, diff --git a/locales/de.json b/locales/de.json index 2b3edf36f81..e731a520137 100644 --- a/locales/de.json +++ b/locales/de.json @@ -206,7 +206,8 @@ "clear_filter": "Filter entfernen", "filter_selected_accessibility": "{{ type }} ({{ count }} Filter ausgewählt)", "show_more": "Mehr anzeigen", - "show_less": "Weniger anzeigen" + "show_less": "Weniger anzeigen", + "filter_and_operator_subtitle": "Allen entsprechen" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Land/Region", "language_label": "Sprache", "update_language": "Sprache aktualisieren", - "update_country": "Land/Region aktualisieren" + "update_country": "Land/Region aktualisieren", + "search": "Suchen", + "popular_countries_regions": "Beliebte Länder/Regionen", + "country_results_count": "{{ count }} Länder/Regionen gefunden" }, "customer": { "account": { diff --git a/locales/de.schema.json b/locales/de.schema.json index f6bffbd66f2..153d125aa55 100644 --- a/locales/de.schema.json +++ b/locales/de.schema.json @@ -264,7 +264,7 @@ "cart_drawer": { "header": "Warenkorbeinschub", "collection": { - "label": "Kategorie", + "label": "Kollektion", "info": "Sichtbar, wenn der Warenkorbeinschub leer ist." } } @@ -1459,7 +1459,7 @@ }, "enable_filtering": { "label": "Filtern aktivieren", - "info": "Passe Filter mit der App Search & Discovery an. [Mehr Informationen](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" + "info": "Passe Filter mit der Search & Discovery-App an. [Mehr Informationen](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" }, "enable_sorting": { "label": "Sortieren aktivieren" @@ -1490,7 +1490,7 @@ }, "enable_tags": { "label": "Filtern aktivieren", - "info": "Passe Filter mit der App Search & Discovery an. [Mehr Informationen](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" + "info": "Passe Filter mit der Search & Discovery-App an. [Mehr Informationen](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" }, "show_rating": { "label": "Produktbewertung anzeigen", @@ -1639,13 +1639,26 @@ "name": "Variantenauswahl", "settings": { "picker_type": { - "label": "Art", + "label": "Optik", "options__1": { "label": "Dropdown" }, "options__2": { "label": "Kapseln" } + }, + "swatch_shape": { + "label": "Farbfeld", + "info": "Erfahre mehr zum Anzeigen von [Farbfeldern](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Kreis" + }, + "options__2": { + "label": "Quadrat" + }, + "options__3": { + "label": "Keine" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Variantenauswahl", "settings": { "picker_type": { - "label": "Art", + "label": "Optik", "options__1": { "label": "Dropdown" }, "options__2": { "label": "Kapseln" } + }, + "swatch_shape": { + "label": "Farbfeld", + "info": "Erfahre mehr zum Anzeigen von [Farbfeldern](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Kreis" + }, + "options__2": { + "label": "Quadrat" + }, + "options__3": { + "label": "Keine" + } } } }, diff --git a/locales/el.json b/locales/el.json index 30776045aac..6c3fa43cbe8 100644 --- a/locales/el.json +++ b/locales/el.json @@ -206,7 +206,8 @@ "clear_filter": "Κατάργηση φίλτρου", "filter_selected_accessibility": "{{ type }} (επιλέχθηκαν {{ count }} φίλτρα)", "show_more": "Εμφάνιση περισσότερων", - "show_less": "Εμφάνιση λιγότερων" + "show_less": "Εμφάνιση λιγότερων", + "filter_and_operator_subtitle": "Αντιστοιχεί με όλα" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Χώρα/περιοχή", "language_label": "Γλώσσα", "update_language": "Ενημέρωση γλώσσας", - "update_country": "Ενημερώστε τη χώρα/περιοχή" + "update_country": "Ενημερώστε τη χώρα/περιοχή", + "search": "Αναζήτηση", + "popular_countries_regions": "Δημοφιλείς χώρες/περιοχές", + "country_results_count": "Βρέθηκαν {{ count }} χώρες/περιοχές" }, "customer": { "account": { diff --git a/locales/en.default.json b/locales/en.default.json index ba2cca63983..06fe88bd86f 100644 --- a/locales/en.default.json +++ b/locales/en.default.json @@ -179,6 +179,7 @@ "label": "Media gallery" }, "facets": { + "filter_and_operator_subtitle": "Match all", "apply": "Apply", "clear": "Clear", "clear_all": "Remove all", @@ -365,7 +366,10 @@ "country_label": "Country/region", "language_label": "Language", "update_language": "Update language", - "update_country": "Update country/region" + "update_country": "Update country/region", + "search": "Search", + "popular_countries_regions": "Popular countries/regions", + "country_results_count": "{{ count }} countries/regions found" }, "customer": { "account": { diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json index 4065f8981f9..cfb28a1a44d 100644 --- a/locales/en.default.schema.json +++ b/locales/en.default.schema.json @@ -851,13 +851,26 @@ "name": "Variant picker", "settings": { "picker_type": { - "label": "Type", + "label": "Style", "options__1": { "label": "Dropdown" }, "options__2": { "label": "Pills" } + }, + "swatch_shape": { + "label": "Swatch", + "info": "Learn how to display [swatches](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Circle" + }, + "options__2": { + "label": "Square" + }, + "options__3": { + "label": "None" + } } } }, @@ -1973,13 +1986,26 @@ "name": "Variant picker", "settings": { "picker_type": { - "label": "Type", + "label": "Style", "options__1": { "label": "Dropdown" }, "options__2": { "label": "Pills" } + }, + "swatch_shape": { + "label": "Swatch", + "info": "Learn how to display [swatches](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Circle" + }, + "options__2": { + "label": "Square" + }, + "options__3": { + "label": "None" + } } } }, diff --git a/locales/es.json b/locales/es.json index c7368208895..ed2fc5d0d13 100644 --- a/locales/es.json +++ b/locales/es.json @@ -210,7 +210,8 @@ "clear_filter": "Eliminar filtro", "filter_selected_accessibility": "{{ type }} ({{ count }} filtros seleccionados)", "show_more": "Mostrar más", - "show_less": "Mostrar menos" + "show_less": "Mostrar menos", + "filter_and_operator_subtitle": "Seleccionar todos" } }, "templates": { @@ -376,7 +377,10 @@ "country_label": "País/región", "language_label": "Idioma", "update_language": "Actualizar idioma", - "update_country": "Actualizar país/región" + "update_country": "Actualizar país/región", + "search": "Buscar", + "popular_countries_regions": "Países o regiones populares", + "country_results_count": "{{ count }} países o regiones encontrados" }, "customer": { "account": { diff --git a/locales/es.schema.json b/locales/es.schema.json index be502eb7c27..1788debd3ea 100644 --- a/locales/es.schema.json +++ b/locales/es.schema.json @@ -1640,13 +1640,26 @@ "name": "Selector de variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Estilo", "options__1": { "label": "Desplegable" }, "options__2": { "label": "Miniaturas" } + }, + "swatch_shape": { + "label": "Muestra", + "info": "Obtén información sobre cómo presentar [muestras](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Círculo" + }, + "options__2": { + "label": "Cuadrado" + }, + "options__3": { + "label": "Ninguna" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Selector de variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Estilo", "options__1": { "label": "Desplegable" }, "options__2": { "label": "Botones" } + }, + "swatch_shape": { + "label": "Muestra", + "info": "Obtén información sobre cómo presentar [muestras](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Círculo" + }, + "options__2": { + "label": "Cuadrado" + }, + "options__3": { + "label": "Ninguna" + } } } }, diff --git a/locales/fi.json b/locales/fi.json index b4d5b22e252..8ef7d12fa21 100644 --- a/locales/fi.json +++ b/locales/fi.json @@ -206,7 +206,8 @@ "clear_filter": "Poista suodatin", "filter_selected_accessibility": "{{ type }} ({{ count }} suodatinta valittu)", "show_more": "Näytä enemmän", - "show_less": "Näytä vähemmän" + "show_less": "Näytä vähemmän", + "filter_and_operator_subtitle": "Sovella kaikkia" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Maa/alue", "language_label": "Kieli", "update_language": "Päivitä kieli", - "update_country": "Päivitä maa/alue" + "update_country": "Päivitä maa/alue", + "search": "Hae", + "popular_countries_regions": "Suositut maat/alueet", + "country_results_count": "{{ count }} maata/aluetta löytyi" }, "customer": { "account": { diff --git a/locales/fi.schema.json b/locales/fi.schema.json index 8aa41cbdccd..0db07100b0e 100644 --- a/locales/fi.schema.json +++ b/locales/fi.schema.json @@ -1639,13 +1639,26 @@ "name": "Versionvalitsin", "settings": { "picker_type": { - "label": "Tyyppi", + "label": "Tyyli", "options__1": { "label": "Pudotusvalikko" }, "options__2": { "label": "Pillerit" } + }, + "swatch_shape": { + "label": "Väriruutu", + "info": "Lisätietoja siitä, miten voit näyttää [väriruudut](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Ympyrä" + }, + "options__2": { + "label": "Neliö" + }, + "options__3": { + "label": "Ei mitään" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Versionvalitsin", "settings": { "picker_type": { - "label": "Tyyppi", + "label": "Tyyli", "options__1": { "label": "Pudotusvalikko" }, "options__2": { "label": "Kuvakkeet" } + }, + "swatch_shape": { + "label": "Väriruutu", + "info": "Lisätietoja siitä, miten voit näyttää [väriruudut](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Ympyrä" + }, + "options__2": { + "label": "Neliö" + }, + "options__3": { + "label": "Ei mitään" + } } } }, diff --git a/locales/fr.json b/locales/fr.json index 98d84318c4d..d76cff9a9eb 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -17,7 +17,7 @@ "share_on_pinterest": "Épingler sur Pinterest" }, "links": { - "twitter": "Twitter", + "twitter": "X", "facebook": "Facebook", "pinterest": "Pinterest", "instagram": "Instagram", @@ -206,11 +206,12 @@ "reset": "Réinitialiser", "sort_button": "Trier", "sort_by_label": "Trier par :", - "to": "À", + "to": "Destination", "clear_filter": "Supprimer le filtre", "filter_selected_accessibility": "{{ type }} ({{ count }} filtres sélectionnés)", "show_more": "Afficher plus", - "show_less": "Afficher moins" + "show_less": "Afficher moins", + "filter_and_operator_subtitle": "Tout associer" } }, "templates": { @@ -298,7 +299,7 @@ "quantity": "Quantité", "image": "Image de produit" }, - "update": "Mettre à jour", + "update": "Mise à jour", "login": { "title": "Vous possédez un compte ?", "paragraph_html": "Connectez-vous pour payer plus vite." @@ -376,7 +377,10 @@ "country_label": "Pays/région", "language_label": "Langue", "update_language": "Mettre à jour la langue", - "update_country": "Mettre à jour le pays/la région" + "update_country": "Mettre à jour le pays/la région", + "search": "Rechercher", + "popular_countries_regions": "Pays/régions populaires", + "country_results_count": "{{ count }} pays/régions trouvés" }, "customer": { "account": { diff --git a/locales/fr.schema.json b/locales/fr.schema.json index e4fc2042d5a..1818ab7ee69 100644 --- a/locales/fr.schema.json +++ b/locales/fr.schema.json @@ -56,7 +56,7 @@ "name": "Médias sociaux", "settings": { "social_twitter_link": { - "label": "Twitter", + "label": "X", "info": "https://twitter.com/shopify" }, "social_facebook_link": { @@ -388,7 +388,7 @@ "label": "Petit" }, "options__2": { - "label": "Moyen" + "label": "Moyenne" }, "options__3": { "label": "Grand" @@ -519,7 +519,7 @@ "label": "Grand bloc gauche" }, "options__2": { - "label": "Grand bloc droit" + "label": "Grand bloc droite" } }, "mobile_layout": { @@ -1033,7 +1033,7 @@ "label": "Petit" }, "options__3": { - "label": "Moyen" + "label": "Moyenne" }, "info": "Pour optimiser vos résultats, utilisez une image ayant un rapport d'aspect de 3:2. [En savoir plus](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", "options__4": { @@ -1171,7 +1171,7 @@ "label": "Petit" }, "options__3": { - "label": "Moyen" + "label": "Moyenne" }, "label": "Hauteur de l'image", "options__4": { @@ -1193,7 +1193,7 @@ "label": "Petit" }, "options__2": { - "label": "Moyen" + "label": "Moyenne" }, "options__3": { "label": "Grand" @@ -1309,7 +1309,7 @@ "label": "Petit" }, "options__2": { - "label": "Moyen" + "label": "Moyenne" }, "options__3": { "label": "Grand" @@ -1337,7 +1337,7 @@ "label": "Petit" }, "options__3": { - "label": "Moyen" + "label": "Moyenne" }, "info": "Pour optimiser vos résultats, utilisez une image ayant un rapport d'aspect de 16:9. [En savoir plus](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", "options__4": { @@ -1413,7 +1413,7 @@ "label": "Petit" }, "options__3": { - "label": "Moyen" + "label": "Moyenne" }, "options__4": { "label": "Grand" @@ -1639,13 +1639,26 @@ "name": "Sélecteur de variante", "settings": { "picker_type": { - "label": "Type", + "label": "Style", "options__1": { "label": "Menu déroulant" }, "options__2": { "label": "Comprimés" } + }, + "swatch_shape": { + "label": "Échantillon", + "info": "Découvrez comment afficher les [échantillons](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Cercle" + }, + "options__2": { + "label": "Carré" + }, + "options__3": { + "label": "Aucun" + } } } }, @@ -2021,7 +2034,7 @@ "label": "Petit" }, "options__2": { - "label": "Moyen" + "label": "Moyenne" }, "options__3": { "label": "Grand" @@ -2375,7 +2388,7 @@ "label": "Petit" }, "options__2": { - "label": "Moyen" + "label": "Moyenne" }, "options__3": { "label": "Grand" @@ -2482,13 +2495,26 @@ "name": "Sélecteur de variante", "settings": { "picker_type": { - "label": "Type", + "label": "Style", "options__1": { "label": "Menu déroulant" }, "options__2": { "label": "Pilules" } + }, + "swatch_shape": { + "label": "Échantillon", + "info": "Découvrez comment afficher les [échantillons](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Cercle" + }, + "options__2": { + "label": "Carré" + }, + "options__3": { + "label": "Aucun" + } } } }, @@ -2607,7 +2633,7 @@ "label": "Petit" }, "options__3": { - "label": "Moyen" + "label": "Moyenne" }, "options__4": { "label": "Grand" @@ -2730,7 +2756,7 @@ "label": "Petit" }, "options__3": { - "label": "Moyen" + "label": "Moyenne" }, "options__4": { "label": "Grand" @@ -3171,7 +3197,7 @@ "label": "Petit" }, "options__3": { - "label": "Moyen" + "label": "Moyenne" }, "options__4": { "label": "Grand" @@ -3183,7 +3209,7 @@ "label": "Petit" }, "options__2": { - "label": "Moyen" + "label": "Moyenne" }, "options__3": { "label": "Grand" @@ -3196,7 +3222,7 @@ "label": "Petit" }, "options__2": { - "label": "Moyen" + "label": "Moyenne" }, "options__3": { "label": "Grand" diff --git a/locales/hr-HR.json b/locales/hr-HR.json index 18bc326d681..291d1f35b5a 100644 --- a/locales/hr-HR.json +++ b/locales/hr-HR.json @@ -210,7 +210,8 @@ "clear_filter": "Ukloni filtar", "filter_selected_accessibility": "{{ type }} (broj odabranih filtra: {{ count }})", "show_more": "Prikaži više", - "show_less": "Prikaži manje" + "show_less": "Prikaži manje", + "filter_and_operator_subtitle": "Uskladi sve" } }, "templates": { @@ -376,7 +377,10 @@ "country_label": "Država/regija", "language_label": "Jezik", "update_language": "Ažuriraj jezik", - "update_country": "Ažuriraj državu/regiju" + "update_country": "Ažuriraj državu/regiju", + "search": "Traži", + "popular_countries_regions": "Popularne zemlje/regije", + "country_results_count": "Pronađen je sljedeći broj zemalja/regija: {{ count }}" }, "customer": { "account": { diff --git a/locales/hu.json b/locales/hu.json index 08bf50c0e0f..5f5bf078f0d 100644 --- a/locales/hu.json +++ b/locales/hu.json @@ -206,7 +206,8 @@ "clear_filter": "Szűrő eltávolítása", "filter_selected_accessibility": "{{ type }} ({{ count }} szűrő kiválasztva)", "show_more": "Több részlet", - "show_less": "Kevesebb részlet" + "show_less": "Kevesebb részlet", + "filter_and_operator_subtitle": "Az összesnek megfelelő" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Ország/régió", "language_label": "Nyelv", "update_language": "Nyelv módosítása", - "update_country": "Ország/régió frissítése" + "update_country": "Ország/régió frissítése", + "search": "Keresés", + "popular_countries_regions": "Népszerű országok/régiók", + "country_results_count": "{{ count }} ország/régió található" }, "customer": { "account": { diff --git a/locales/id.json b/locales/id.json index 5ee952242c0..b732a2da2dc 100644 --- a/locales/id.json +++ b/locales/id.json @@ -206,7 +206,8 @@ "clear_filter": "Hapus filter", "filter_selected_accessibility": "{{ type }} ({{ count }} filter dipilih)", "show_more": "Selengkapnya", - "show_less": "Sembunyikan lainnya" + "show_less": "Sembunyikan lainnya", + "filter_and_operator_subtitle": "Cocokkan semua" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Negara/Wilayah", "language_label": "Bahasa", "update_language": "Perbarui bahasa", - "update_country": "Perbarui negara/wilayah" + "update_country": "Perbarui negara/wilayah", + "search": "Cari", + "popular_countries_regions": "Negara/wilayah populer", + "country_results_count": "{{ count }} negara/wilayah ditemukan" }, "customer": { "account": { diff --git a/locales/it.json b/locales/it.json index d977d1316d8..2ff3d78d9a7 100644 --- a/locales/it.json +++ b/locales/it.json @@ -210,7 +210,8 @@ "clear_filter": "Rimuovi filtri", "filter_selected_accessibility": "{{ type }} ({{ count }} filtri selezionati)", "show_more": "Mostra di più", - "show_less": "Mostra di meno" + "show_less": "Mostra di meno", + "filter_and_operator_subtitle": "Seleziona tutte" } }, "templates": { @@ -376,7 +377,10 @@ "country_label": "Paese/Area geografica", "language_label": "Lingua", "update_language": "Aggiorna lingua", - "update_country": "Aggiorna paese/area geografica" + "update_country": "Aggiorna paese/area geografica", + "search": "Cerca", + "popular_countries_regions": "Paesi/aree geografiche popolari", + "country_results_count": "{{ count }} paesi/aree geografiche trovati" }, "customer": { "account": { diff --git a/locales/it.schema.json b/locales/it.schema.json index f61499c05f7..cd28302907b 100644 --- a/locales/it.schema.json +++ b/locales/it.schema.json @@ -1640,13 +1640,26 @@ "name": "Selettore di variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Stile", "options__1": { "label": "Menu a discesa" }, "options__2": { "label": "\"A pillole\"" } + }, + "swatch_shape": { + "label": "Campione di colore", + "info": "Scopri come visualizzare i [campioni di colore](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Tondo" + }, + "options__2": { + "label": "Quadrato" + }, + "options__3": { + "label": "Nessuno" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Selettore di variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Stile", "options__1": { "label": "Menu a discesa" }, "options__2": { "label": "\"A pillole\"" } + }, + "swatch_shape": { + "label": "Campione di colore", + "info": "Scopri come visualizzare i [campioni di colore](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Tondo" + }, + "options__2": { + "label": "Quadrato" + }, + "options__3": { + "label": "Nessuno" + } } } }, diff --git a/locales/ja.json b/locales/ja.json index b88159eb4e8..0e616f78e36 100644 --- a/locales/ja.json +++ b/locales/ja.json @@ -206,7 +206,8 @@ "clear_filter": "絞り込みを削除する", "filter_selected_accessibility": "{{ type }} ({{ count }}件のフィルターを選択済み)", "show_more": "さらに表示する", - "show_less": "表示を減らす" + "show_less": "表示を減らす", + "filter_and_operator_subtitle": "すべて一致" } }, "templates": { @@ -277,10 +278,10 @@ "empty": "カートは空です", "cart_error": "カートをアップデートするときにエラーが発生しました。もう一度お試しください。", "cart_quantity_error_html": "このアイテムは{{ quantity }}個しかカートに追加することができません。", - "taxes_and_shipping_policy_at_checkout_html": "税、ディスカウント、および配送料はチエックアウト時に計算されます", + "taxes_and_shipping_policy_at_checkout_html": "税、ディスカウント、および配送料はチェックアウト時に計算されます", "taxes_included_but_shipping_at_checkout": "税込みで、配送料とディスカウントはチェックアアウト時に計算されます", - "taxes_included_and_shipping_policy_html": "税込。配送料とディスカウントはチエックアウト時に計算されます", - "taxes_and_shipping_at_checkout": "税、ディスカウント、および配送料はチエックアウト時に計算されます", + "taxes_included_and_shipping_policy_html": "税込。配送料とディスカウントはチェックアウト時に計算されます", + "taxes_and_shipping_at_checkout": "税、ディスカウント、および配送料はチェックアウト時に計算されます", "headings": { "product": "商品", "price": "価格", @@ -364,7 +365,10 @@ "country_label": "国/地域", "language_label": "言語", "update_language": "言語を更新する", - "update_country": "国/地域を更新する" + "update_country": "国/地域を更新する", + "search": "検索", + "popular_countries_regions": "人気のある国/地域", + "country_results_count": "{{ count }}の国/地域が見つかりました" }, "customer": { "account": { diff --git a/locales/ja.schema.json b/locales/ja.schema.json index 8feb1e14e4f..771f58f604a 100644 --- a/locales/ja.schema.json +++ b/locales/ja.schema.json @@ -1628,18 +1628,31 @@ "name": "テキスト" }, "variant_picker": { + "name": "バリエーションピッカー", "settings": { "picker_type": { - "label": "タイプ", + "label": "スタイル", "options__1": { "label": "ドロップダウン" }, "options__2": { "label": "ピル型ボタン" } + }, + "swatch_shape": { + "label": "見本", + "info": "[見本](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches) の表示方法はこちら", + "options__1": { + "label": "円形" + }, + "options__2": { + "label": "正方形" + }, + "options__3": { + "label": "なし" + } } - }, - "name": "バリエーションピッカー" + } }, "buy_buttons": { "settings": { @@ -2482,13 +2495,26 @@ "name": "バリエーションピッカー", "settings": { "picker_type": { - "label": "タイプ", + "label": "スタイル", "options__1": { "label": "ドロップダウン" }, "options__2": { "label": "ピル型ボタン" } + }, + "swatch_shape": { + "label": "見本", + "info": "[見本](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches) の表示方法はこちら", + "options__1": { + "label": "円形" + }, + "options__2": { + "label": "正方形" + }, + "options__3": { + "label": "なし" + } } } }, diff --git a/locales/ko.json b/locales/ko.json index 8f3ef66223d..43619eb8be7 100644 --- a/locales/ko.json +++ b/locales/ko.json @@ -206,7 +206,8 @@ "clear_filter": "필터 제거", "filter_selected_accessibility": "{{ type }}({{ count }}개 필터 선택됨)", "show_more": "자세히 표시", - "show_less": "간단히 표시" + "show_less": "간단히 표시", + "filter_and_operator_subtitle": "모두 일치" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "국가/지역", "language_label": "언어", "update_language": "언어 업데이트", - "update_country": "국가/지역 업데이트" + "update_country": "국가/지역 업데이트", + "search": "검색", + "popular_countries_regions": "인기 국가/지역", + "country_results_count": "{{ count }}개의 국가/지역 찾음" }, "customer": { "account": { diff --git a/locales/ko.schema.json b/locales/ko.schema.json index 4aa26ab0c65..263997389fd 100644 --- a/locales/ko.schema.json +++ b/locales/ko.schema.json @@ -1628,18 +1628,31 @@ "name": "텍스트" }, "variant_picker": { + "name": "이형 상품 피커", "settings": { "picker_type": { - "label": "유형", + "label": "스타일", "options__1": { "label": "드롭다운" }, "options__2": { "label": "타원형" } + }, + "swatch_shape": { + "label": "견본", + "info": "[견본](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)을 표시할 방법을 알아보세요", + "options__1": { + "label": "원형" + }, + "options__2": { + "label": "정사각형" + }, + "options__3": { + "label": "없음" + } } - }, - "name": "이형 상품 피커" + } }, "buy_buttons": { "settings": { @@ -2482,13 +2495,26 @@ "name": "이형 상품 피커", "settings": { "picker_type": { - "label": "유형", + "label": "스타일", "options__1": { "label": "드롭다운" }, "options__2": { "label": "타원형" } + }, + "swatch_shape": { + "label": "견본", + "info": "[견본](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)을 표시할 방법을 알아보세요", + "options__1": { + "label": "원형" + }, + "options__2": { + "label": "정사각형" + }, + "options__3": { + "label": "없음" + } } } }, diff --git a/locales/lt-LT.json b/locales/lt-LT.json index 73241e2bb22..5414b41f988 100644 --- a/locales/lt-LT.json +++ b/locales/lt-LT.json @@ -214,7 +214,8 @@ "clear_filter": "Pašalinti filtrą", "filter_selected_accessibility": "{{ type }} (pasirinkta filtrų: {{ count }})", "show_more": "Rodyti daugiau", - "show_less": "Rodyti mažiau" + "show_less": "Rodyti mažiau", + "filter_and_operator_subtitle": "Atitikti visas" } }, "templates": { @@ -388,7 +389,10 @@ "country_label": "Šalis / regionas", "language_label": "Kalba", "update_language": "Atnaujinti kalbą", - "update_country": "Atnaujinti šalį / regioną" + "update_country": "Atnaujinti šalį / regioną", + "search": "Ieškoti", + "popular_countries_regions": "Populiarios valstybės / regionai", + "country_results_count": "Rasta valstybių / regionų: {{ count }}" }, "customer": { "account": { diff --git a/locales/nb.json b/locales/nb.json index c98a886ed0c..44aa313c9e2 100644 --- a/locales/nb.json +++ b/locales/nb.json @@ -206,7 +206,8 @@ "clear_filter": "Fjern filter", "filter_selected_accessibility": "{{ type }} ({{ count }} filtre valgt)", "show_more": "Vis mer", - "show_less": "Vis færre" + "show_less": "Vis færre", + "filter_and_operator_subtitle": "Match alle" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Land/region", "language_label": "Språk", "update_language": "Oppdater språk", - "update_country": "Oppdater land/region" + "update_country": "Oppdater land/region", + "search": "Søk", + "popular_countries_regions": "Populære land/regioner", + "country_results_count": "{{ count }} land/regioner funnet" }, "customer": { "account": { diff --git a/locales/nb.schema.json b/locales/nb.schema.json index 41038ea40c3..d2e7b17f78b 100644 --- a/locales/nb.schema.json +++ b/locales/nb.schema.json @@ -388,7 +388,7 @@ "label": "Liten" }, "options__2": { - "label": "Middels" + "label": "Medie" }, "options__3": { "label": "Stor" @@ -1033,7 +1033,7 @@ "label": "Liten" }, "options__3": { - "label": "Middels" + "label": "Medie" }, "info": "Bruk et bilde med størrelsesforhold 3:2 for best resultat. [Finn ut mer](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", "options__4": { @@ -1171,7 +1171,7 @@ "label": "Liten" }, "options__3": { - "label": "Middels" + "label": "Medie" }, "label": "Bildehøyde", "options__4": { @@ -1193,7 +1193,7 @@ "label": "Liten" }, "options__2": { - "label": "Middels" + "label": "Medie" }, "options__3": { "label": "Stor" @@ -1309,7 +1309,7 @@ "label": "Liten" }, "options__2": { - "label": "Middels" + "label": "Medie" }, "options__3": { "label": "Stor" @@ -1337,7 +1337,7 @@ "label": "Liten" }, "options__3": { - "label": "Middels" + "label": "Medie" }, "info": "Bruk et bilde med størrelsesforhold 16:9 for best resultat. [Finn ut mer](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", "options__4": { @@ -1413,7 +1413,7 @@ "label": "Liten" }, "options__3": { - "label": "Middels" + "label": "Medie" }, "options__4": { "label": "Stor" @@ -1639,13 +1639,26 @@ "name": "Variantvelger", "settings": { "picker_type": { - "label": "Type", + "label": "Stil", "options__1": { "label": "Rullegardin" }, "options__2": { "label": "Knapper" } + }, + "swatch_shape": { + "label": "Fargekart", + "info": "Finn ut hvordan du viser [fargekart](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Sirkel" + }, + "options__2": { + "label": "Firkant" + }, + "options__3": { + "label": "Ingen" + } } } }, @@ -2021,7 +2034,7 @@ "label": "Liten" }, "options__2": { - "label": "Middels" + "label": "Medie" }, "options__3": { "label": "Stor" @@ -2375,7 +2388,7 @@ "label": "Liten" }, "options__2": { - "label": "Middels" + "label": "Medie" }, "options__3": { "label": "Stor" @@ -2482,13 +2495,26 @@ "name": "Variantvelger", "settings": { "picker_type": { - "label": "Type", + "label": "Stil", "options__1": { "label": "Rullegardin" }, "options__2": { "label": "Knapper" } + }, + "swatch_shape": { + "label": "Fargekart", + "info": "Finn ut hvordan du viser [fargekart](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Sirkel" + }, + "options__2": { + "label": "Firkant" + }, + "options__3": { + "label": "Ingen" + } } } }, @@ -2607,7 +2633,7 @@ "label": "Liten" }, "options__3": { - "label": "Middels" + "label": "Medie" }, "options__4": { "label": "Stor" @@ -2730,7 +2756,7 @@ "label": "Liten" }, "options__3": { - "label": "Middels" + "label": "Medie" }, "options__4": { "label": "Stor" @@ -3171,7 +3197,7 @@ "label": "Liten" }, "options__3": { - "label": "Middels" + "label": "Medie" }, "options__4": { "label": "Stor" @@ -3183,7 +3209,7 @@ "label": "Liten" }, "options__2": { - "label": "Middels" + "label": "Medie" }, "options__3": { "label": "Stor" @@ -3196,7 +3222,7 @@ "label": "Liten" }, "options__2": { - "label": "Middels" + "label": "Medie" }, "options__3": { "label": "Stor" diff --git a/locales/nl.json b/locales/nl.json index 2ed0207e0f9..e1514ebbf3c 100644 --- a/locales/nl.json +++ b/locales/nl.json @@ -206,7 +206,8 @@ "clear_filter": "Filter verwijderen", "filter_selected_accessibility": "{{ type }} ({{ count }} filters geselecteerd)", "show_more": "Meer weergeven", - "show_less": "Minder weergeven" + "show_less": "Minder weergeven", + "filter_and_operator_subtitle": "Alles matchen" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Land/regio", "language_label": "Taal", "update_language": "Taal bijwerken", - "update_country": "Land/regio bijwerken" + "update_country": "Land/regio bijwerken", + "search": "Zoeken", + "popular_countries_regions": "Populaire landen/regio's", + "country_results_count": "{{ count }} landen/regio's gevonden" }, "customer": { "account": { diff --git a/locales/nl.schema.json b/locales/nl.schema.json index 4ae878c6733..3f0146ba34a 100644 --- a/locales/nl.schema.json +++ b/locales/nl.schema.json @@ -1640,13 +1640,26 @@ "name": "Variantkiezer", "settings": { "picker_type": { - "label": "Type", + "label": "Stijl", "options__1": { "label": "Vervolgkeuzelijst" }, "options__2": { "label": "Pillen" } + }, + "swatch_shape": { + "label": "Staal", + "info": "Ontdek hoe je [stalen](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches) weergeeft", + "options__1": { + "label": "Cirkel" + }, + "options__2": { + "label": "Vierkant" + }, + "options__3": { + "label": "Geen" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Variantkiezer", "settings": { "picker_type": { - "label": "Type", + "label": "Stijl", "options__1": { "label": "Vervolgkeuzelijst" }, "options__2": { "label": "Keuzeopties" } + }, + "swatch_shape": { + "label": "Staal", + "info": "Ontdek hoe je [stalen](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches) weergeeft", + "options__1": { + "label": "Cirkel" + }, + "options__2": { + "label": "Vierkant" + }, + "options__3": { + "label": "Geen" + } } } }, diff --git a/locales/pl.json b/locales/pl.json index b7b2774877f..73ab5d2567d 100644 --- a/locales/pl.json +++ b/locales/pl.json @@ -214,7 +214,8 @@ "clear_filter": "Usuń filtr", "filter_selected_accessibility": "{{ type }} (wybrano {{ count }} fitry(-ów))", "show_more": "Pokaż więcej", - "show_less": "Pokaż mniej" + "show_less": "Pokaż mniej", + "filter_and_operator_subtitle": "Dopasuj wszystko" } }, "templates": { @@ -388,7 +389,10 @@ "country_label": "Kraj/region", "language_label": "Język", "update_language": "Aktualizuj język", - "update_country": "Aktualizuj kraj/region" + "update_country": "Aktualizuj kraj/region", + "search": "Szukaj", + "popular_countries_regions": "Popularne kraje/regiony", + "country_results_count": "Liczba znalezionych krajów/regionów: {{ count }}" }, "customer": { "account": { diff --git a/locales/pl.schema.json b/locales/pl.schema.json index 40b5172761c..af61e7eb49d 100644 --- a/locales/pl.schema.json +++ b/locales/pl.schema.json @@ -1640,13 +1640,26 @@ "name": "Selektor wariantów", "settings": { "picker_type": { - "label": "Typ", + "label": "Styl", "options__1": { "label": "Lista rozwijana" }, "options__2": { "label": "Okrągłe przełączniki" } + }, + "swatch_shape": { + "label": "Próbka", + "info": "Dowiedz się, jak wyświetlać [próbki](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Koło" + }, + "options__2": { + "label": "Kwadrat" + }, + "options__3": { + "label": "Brak" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Selektor wariantów", "settings": { "picker_type": { - "label": "Typ", + "label": "Styl", "options__1": { "label": "Lista rozwijana" }, "options__2": { "label": "Okrągłe przełączniki" } + }, + "swatch_shape": { + "label": "Próbka", + "info": "Dowiedz się, jak wyświetlać [próbki](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Koło" + }, + "options__2": { + "label": "Kwadrat" + }, + "options__3": { + "label": "Brak" + } } } }, diff --git a/locales/pt-BR.json b/locales/pt-BR.json index 2b8a80638d6..0da9954eb96 100644 --- a/locales/pt-BR.json +++ b/locales/pt-BR.json @@ -210,7 +210,8 @@ "clear_filter": "Remover filtro", "filter_selected_accessibility": "{{ type }} ({{ count }} filtros selecionados)", "show_more": "Exibir mais", - "show_less": "Exibir menos" + "show_less": "Exibir menos", + "filter_and_operator_subtitle": "Corresponder todos" } }, "templates": { @@ -376,7 +377,10 @@ "country_label": "País/Região", "language_label": "Idioma", "update_language": "Atualizar idioma", - "update_country": "Atualizar país/região" + "update_country": "Atualizar país/região", + "search": "Pesquisar", + "popular_countries_regions": "Países/regiões populares", + "country_results_count": "{{ count }} países/regiões encontrados" }, "customer": { "account": { diff --git a/locales/pt-BR.schema.json b/locales/pt-BR.schema.json index fae86846814..11af56c5e79 100644 --- a/locales/pt-BR.schema.json +++ b/locales/pt-BR.schema.json @@ -1639,13 +1639,26 @@ "name": "Seletor de variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Estilo", "options__1": { "label": "Menu suspenso" }, "options__2": { "label": "Pílulas" } + }, + "swatch_shape": { + "label": "Amostra", + "info": "Saiba como exibir [amostras](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Círculo" + }, + "options__2": { + "label": "Quadrado" + }, + "options__3": { + "label": "Nenhuma" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Seletor de variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Estilo", "options__1": { "label": "Menu suspenso" }, "options__2": { "label": "Pílulas" } + }, + "swatch_shape": { + "label": "Amostra", + "info": "Saiba como exibir [amostras](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Círculo" + }, + "options__2": { + "label": "Quadrado" + }, + "options__3": { + "label": "Nenhuma" + } } } }, diff --git a/locales/pt-PT.json b/locales/pt-PT.json index 000b7f8aaea..3a199de50cb 100644 --- a/locales/pt-PT.json +++ b/locales/pt-PT.json @@ -210,7 +210,8 @@ "clear_filter": "Remover filtro", "filter_selected_accessibility": "{{ type }} ({{ count }} filtros selecionados)", "show_more": "Mostrar mais", - "show_less": "Mostrar menos" + "show_less": "Mostrar menos", + "filter_and_operator_subtitle": "Corresponder todos" } }, "templates": { @@ -376,7 +377,10 @@ "country_label": "País/região", "language_label": "Idioma", "update_language": "Atualizar idioma", - "update_country": "Atualizar país/região" + "update_country": "Atualizar país/região", + "search": "Pesquisar", + "popular_countries_regions": "Países/regiões populares", + "country_results_count": "{{ count }} países/regiões encontrados" }, "customer": { "account": { diff --git a/locales/pt-PT.schema.json b/locales/pt-PT.schema.json index 8ef6e3f1278..762f5fd1cf3 100644 --- a/locales/pt-PT.schema.json +++ b/locales/pt-PT.schema.json @@ -1628,18 +1628,31 @@ "name": "Texto" }, "variant_picker": { + "name": "Seletor de variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Estilo", "options__1": { "label": "Pendente" }, "options__2": { "label": "Comprimidos" } + }, + "swatch_shape": { + "label": "Paleta", + "info": "Saiba como exibir [paletas](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Círculo" + }, + "options__2": { + "label": "Quadrado" + }, + "options__3": { + "label": "Nenhum" + } } - }, - "name": "Seletor de variante" + } }, "buy_buttons": { "settings": { @@ -2482,13 +2495,26 @@ "name": "Seletor de variante", "settings": { "picker_type": { - "label": "Tipo", + "label": "Estilo", "options__1": { "label": "Pendente" }, "options__2": { "label": "Forma de comprimidos" } + }, + "swatch_shape": { + "label": "Paleta", + "info": "Saiba como exibir [paletas](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Círculo" + }, + "options__2": { + "label": "Quadrado" + }, + "options__3": { + "label": "Nenhum" + } } } }, diff --git a/locales/ro-RO.json b/locales/ro-RO.json index 829e15c6814..ba868f98f7f 100644 --- a/locales/ro-RO.json +++ b/locales/ro-RO.json @@ -210,7 +210,8 @@ "clear_filter": "Elimină filtrul", "filter_selected_accessibility": "{{ type }} ({{ count }} filtre selectate)", "show_more": "Afișează mai mult", - "show_less": "Afișează mai puțin" + "show_less": "Afișează mai puțin", + "filter_and_operator_subtitle": "Potrivește-le pe toate" } }, "templates": { @@ -376,7 +377,10 @@ "country_label": "Țară/Regiune", "language_label": "Limbă", "update_language": "Actualizați limba", - "update_country": "Actualizați țara/regiunea" + "update_country": "Actualizați țara/regiunea", + "search": "Caută", + "popular_countries_regions": "Țări/regiuni populare", + "country_results_count": "{{ count }} țări/regiuni găsite" }, "customer": { "account": { diff --git a/locales/ru.json b/locales/ru.json index ea78c1cd767..94edd32c189 100644 --- a/locales/ru.json +++ b/locales/ru.json @@ -214,7 +214,8 @@ "clear_filter": "Снять фильтр", "filter_selected_accessibility": "{{ type }} (установлены фильтры: {{ count }})", "show_more": "Показать больше", - "show_less": "Показать меньше" + "show_less": "Показать меньше", + "filter_and_operator_subtitle": "Выбрать все" } }, "templates": { @@ -388,7 +389,10 @@ "country_label": "Страна/регион", "language_label": "Язык", "update_language": "Изменить язык", - "update_country": "Изменить данные о стране/регионе" + "update_country": "Изменить данные о стране/регионе", + "search": "Поиск", + "popular_countries_regions": "Популярные страны / регионы", + "country_results_count": "Найдены страны / регионы: {{ count }}" }, "customer": { "account": { diff --git a/locales/sk-SK.json b/locales/sk-SK.json index c3b1dbe4d65..662a787f3e1 100644 --- a/locales/sk-SK.json +++ b/locales/sk-SK.json @@ -214,7 +214,8 @@ "clear_filter": "Odstrániť filter", "filter_selected_accessibility": "{{ type }} (vybrané filtre: {{ count }})", "show_more": "Zobraziť viac", - "show_less": "Zobraziť menej" + "show_less": "Zobraziť menej", + "filter_and_operator_subtitle": "Spĺňať všetko" } }, "templates": { @@ -388,7 +389,10 @@ "country_label": "Krajina/oblasť", "language_label": "Jazyk", "update_language": "Aktualizovať jazyk", - "update_country": "Aktualizovať krajinu/oblasť" + "update_country": "Aktualizovať krajinu/oblasť", + "search": "Vyhľadať", + "popular_countries_regions": "Obľúbené krajiny/oblasti", + "country_results_count": "Našiel sa tento počet krajín/oblastí: {{ count }}" }, "customer": { "account": { diff --git a/locales/sl-SI.json b/locales/sl-SI.json index fa6b4386ebb..d1fbb3e6bd1 100644 --- a/locales/sl-SI.json +++ b/locales/sl-SI.json @@ -214,7 +214,8 @@ "clear_filter": "Odstrani filter", "filter_selected_accessibility": "{{ type }} (št. izbranih filtrov: {{ count }})", "show_more": "Prikaži več", - "show_less": "Prikaži manj" + "show_less": "Prikaži manj", + "filter_and_operator_subtitle": "Ustreza vsem" } }, "templates": { @@ -388,7 +389,10 @@ "country_label": "Država/regija", "language_label": "Jezik", "update_language": "Posodobi jezik", - "update_country": "Posodobi državo/regijo" + "update_country": "Posodobi državo/regijo", + "search": "Išči", + "popular_countries_regions": "Priljubljene države/regije", + "country_results_count": "Najdene države/regije: {{ count }}" }, "customer": { "account": { diff --git a/locales/sv.json b/locales/sv.json index 409f03840cd..bbe2868cfef 100644 --- a/locales/sv.json +++ b/locales/sv.json @@ -206,7 +206,8 @@ "clear_filter": "Ta bort filter", "filter_selected_accessibility": "{{ type }} ({{ count }}) filter valda", "show_more": "Visa mer", - "show_less": "Visa mindre" + "show_less": "Visa mindre", + "filter_and_operator_subtitle": "Matcha alla" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Land/Region", "language_label": "Språk", "update_language": "Uppdatera språk", - "update_country": "Uppdatera land/region" + "update_country": "Uppdatera land/region", + "search": "Sök", + "popular_countries_regions": "Populära länder/regioner", + "country_results_count": "{{ count }} länder/regioner hittades" }, "customer": { "account": { diff --git a/locales/sv.schema.json b/locales/sv.schema.json index 431530de3c4..f4bf2af050b 100644 --- a/locales/sv.schema.json +++ b/locales/sv.schema.json @@ -1628,18 +1628,31 @@ "name": "Text" }, "variant_picker": { + "name": "Variantväljare", "settings": { "picker_type": { - "label": "Typ", + "label": "Stil", "options__1": { "label": "Rullgardinsmeny" }, "options__2": { "label": "Kapslar" } + }, + "swatch_shape": { + "label": "Prov", + "info": "Läs om hur du visar [prover](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Cirkel" + }, + "options__2": { + "label": "Fyrkantig" + }, + "options__3": { + "label": "Ingen" + } } - }, - "name": "Variantväljare" + } }, "buy_buttons": { "settings": { @@ -2482,13 +2495,26 @@ "name": "Variantväljare", "settings": { "picker_type": { - "label": "Typ", + "label": "Stil", "options__1": { "label": "Rullgardinsmeny" }, "options__2": { "label": "Kapslar" } + }, + "swatch_shape": { + "label": "Prov", + "info": "Läs om hur du visar [prover](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Cirkel" + }, + "options__2": { + "label": "Fyrkantig" + }, + "options__3": { + "label": "Ingen" + } } } }, diff --git a/locales/th.json b/locales/th.json index fee77f60164..87abc5823ad 100644 --- a/locales/th.json +++ b/locales/th.json @@ -206,7 +206,8 @@ "clear_filter": "ลบตัวกรองออก", "filter_selected_accessibility": "{{ type }} (เลือกตัวกรองแล้ว {{ count }} รายการ)", "show_more": "แสดงมากขึ้น", - "show_less": "แสดงน้อยลง" + "show_less": "แสดงน้อยลง", + "filter_and_operator_subtitle": "ที่ตรงกันทั้งหมด" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "ประเทศ/ภูมิภาค", "language_label": "ภาษา", "update_language": "อัปเดตภาษา", - "update_country": "อัปเดตประเทศ/ภูมิภาค" + "update_country": "อัปเดตประเทศ/ภูมิภาค", + "search": "ค้นหา", + "popular_countries_regions": "ประเทศ/ภูมิภาคยอดนิยม", + "country_results_count": "พบประเทศ/ภูมิภาค {{ count }} แห่ง" }, "customer": { "account": { diff --git a/locales/th.schema.json b/locales/th.schema.json index 2bc0f83156e..346f177f050 100644 --- a/locales/th.schema.json +++ b/locales/th.schema.json @@ -1628,18 +1628,31 @@ "name": "ข้อความ" }, "variant_picker": { + "name": "รายการตัวเลือกสินค้า", "settings": { "picker_type": { - "label": "ประเภท", + "label": "รูปแบบ", "options__1": { "label": "ดรอปดาวน์" }, "options__2": { "label": "ทรงเม็ดยา" } + }, + "swatch_shape": { + "label": "ตัวอย่าง", + "info": "เรียนรู้เกี่ยวกับวิธีการแสดง [ตัวอย่าง](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "วงกลม" + }, + "options__2": { + "label": "สี่เหลี่ยมจัตุรัส" + }, + "options__3": { + "label": "ไม่มี" + } } - }, - "name": "รายการตัวเลือกสินค้า" + } }, "buy_buttons": { "settings": { @@ -2482,13 +2495,26 @@ "name": "รายการตัวเลือกสินค้า", "settings": { "picker_type": { - "label": "ประเภท", + "label": "รูปแบบ", "options__1": { "label": "ดรอปดาวน์" }, "options__2": { "label": "ทรงเม็ดยา" } + }, + "swatch_shape": { + "label": "ตัวอย่าง", + "info": "เรียนรู้เกี่ยวกับวิธีการแสดง [ตัวอย่าง](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "วงกลม" + }, + "options__2": { + "label": "สี่เหลี่ยมจัตุรัส" + }, + "options__3": { + "label": "ไม่มี" + } } } }, diff --git a/locales/tr.json b/locales/tr.json index 99e4a2010be..8e67a8f7f20 100644 --- a/locales/tr.json +++ b/locales/tr.json @@ -206,7 +206,8 @@ "clear_filter": "Filtreyi kaldır", "filter_selected_accessibility": "{{ type }} ({{ count }} filtre seçildi)", "show_more": "Daha fazla göster", - "show_less": "Daha az göster" + "show_less": "Daha az göster", + "filter_and_operator_subtitle": "Tümünü eşleştir" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Ülke/bölge", "language_label": "Dil", "update_language": "Dili güncelle", - "update_country": "Ülke/bölge bilgisini güncelle" + "update_country": "Ülke/bölge bilgisini güncelle", + "search": "Ara", + "popular_countries_regions": "Popüler ülkeler/bölgeler", + "country_results_count": "{{ count }} ülke/bölge bulundu" }, "customer": { "account": { diff --git a/locales/tr.schema.json b/locales/tr.schema.json index 55a129a6406..aeeb1fe0b04 100644 --- a/locales/tr.schema.json +++ b/locales/tr.schema.json @@ -1639,13 +1639,26 @@ "name": "Varyasyon seçici", "settings": { "picker_type": { - "label": "Tür", + "label": "Stil", "options__1": { "label": "Açılır liste" }, "options__2": { "label": "Seçenekler" } + }, + "swatch_shape": { + "label": "Numune parça", + "info": "[Numune parçalarını](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches) nasıl görüntüleyeceğinizi öğrenin", + "options__1": { + "label": "Yuvarlak" + }, + "options__2": { + "label": "Kare" + }, + "options__3": { + "label": "Yok" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Varyasyon seçici", "settings": { "picker_type": { - "label": "Tür", + "label": "Stil", "options__1": { "label": "Açılır menü" }, "options__2": { "label": "Seçenekler" } + }, + "swatch_shape": { + "label": "Numune parça", + "info": "[Numune parçalarını](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches) nasıl görüntüleyeceğinizi öğrenin", + "options__1": { + "label": "Yuvarlak" + }, + "options__2": { + "label": "Kare" + }, + "options__3": { + "label": "Yok" + } } } }, diff --git a/locales/vi.json b/locales/vi.json index 64887d3f739..409eccd973e 100644 --- a/locales/vi.json +++ b/locales/vi.json @@ -206,7 +206,8 @@ "clear_filter": "Xóa bộ lọc", "filter_selected_accessibility": "{{ type }} (Đã chọn {{ count }} bộ lọc)", "show_more": "Hiển thị thêm", - "show_less": "Rút gọn" + "show_less": "Rút gọn", + "filter_and_operator_subtitle": "Phù hợp với tất cả" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "Quốc gia/khu vực", "language_label": "Ngôn ngữ", "update_language": "Cập nhật ngôn ngữ", - "update_country": "Cập nhật quốc gia/khu vực" + "update_country": "Cập nhật quốc gia/khu vực", + "search": "Tìm kiếm", + "popular_countries_regions": "Quốc gia/khu vực phổ biến", + "country_results_count": "Đã tìm thấy {{ count }} quốc gia/khu vực" }, "customer": { "account": { diff --git a/locales/vi.schema.json b/locales/vi.schema.json index a3743d3bf23..cf831256b82 100644 --- a/locales/vi.schema.json +++ b/locales/vi.schema.json @@ -1640,13 +1640,26 @@ "name": "Trình chọn mẫu mã", "settings": { "picker_type": { - "label": "Loại", + "label": "Kiểu", "options__1": { "label": "Menu thả xuống" }, "options__2": { "label": "Góc bo tròn" } + }, + "swatch_shape": { + "label": "Mẫu", + "info": "Tìm hiểu cách hiển thị [swatches](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Tròn" + }, + "options__2": { + "label": "Vuông" + }, + "options__3": { + "label": "Không" + } } } }, @@ -2482,13 +2495,26 @@ "name": "Trình chọn mẫu mã", "settings": { "picker_type": { - "label": "Loại", + "label": "Kiểu", "options__1": { "label": "Menu thả xuống" }, "options__2": { "label": "Ô chọn" } + }, + "swatch_shape": { + "label": "Mẫu", + "info": "Tìm hiểu cách hiển thị [swatches](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "Tròn" + }, + "options__2": { + "label": "Vuông" + }, + "options__3": { + "label": "Không" + } } } }, diff --git a/locales/zh-CN.json b/locales/zh-CN.json index 67bca53bef9..9ec8f2893cd 100644 --- a/locales/zh-CN.json +++ b/locales/zh-CN.json @@ -206,7 +206,8 @@ "clear_filter": "删除筛选条件", "filter_selected_accessibility": "{{ type }}（已选择 {{ count }} 个筛选条件）", "show_more": "显示更多内容", - "show_less": "隐藏部分内容" + "show_less": "隐藏部分内容", + "filter_and_operator_subtitle": "匹配全部" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "国家/地区", "language_label": "语言", "update_language": "更新语言", - "update_country": "更新国家/地区" + "update_country": "更新国家/地区", + "search": "搜索", + "popular_countries_regions": "热门国家/地区", + "country_results_count": "找到 {{ count }} 个国家/地区" }, "customer": { "account": { diff --git a/locales/zh-CN.schema.json b/locales/zh-CN.schema.json index 78a321ef1e5..f12eefe5c27 100644 --- a/locales/zh-CN.schema.json +++ b/locales/zh-CN.schema.json @@ -222,7 +222,7 @@ }, "variant_pills": { "name": "多属性椭圆形框", - "paragraph": "多属性椭圆形框是显示产品多属性的一种方式。[了解详细信息](https://help.shopify.com/en/manual/online-store/themes/theme-structure/page-types#variant-picker-block)" + "paragraph": "多属性椭圆形框是显示产品多属性的一种方式。[详细了解](https://help.shopify.com/en/manual/online-store/themes/theme-structure/page-types#variant-picker-block)" }, "inputs": { "name": "输入" @@ -585,7 +585,7 @@ }, "description": { "label": "视频替代文本", - "info": "为使用屏幕阅读器的客户描述视频。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#video-block)" + "info": "为使用屏幕阅读器的客户描述视频。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#video-block)" } }, "name": "视频" @@ -612,7 +612,7 @@ "options__3": { "label": "方形" }, - "info": "通过编辑产品集合来添加图片。[了解详细信息](https://help.shopify.com/manual/products/collections)" + "info": "通过编辑产品集合来添加图片。[详细了解](https://help.shopify.com/manual/products/collections)" }, "swipe_on_mobile": { "label": "在移动设备上启用刷卡功能" @@ -661,7 +661,7 @@ "settings": { "custom_liquid": { "label": "Liquid 代码", - "info": "添加应用代码片段或其他代码以创建高级自定义。[了解详细信息](https://shopify.dev/docs/api/liquid)" + "info": "添加应用代码片段或其他代码以创建高级自定义。[详细了解](https://shopify.dev/docs/api/liquid)" } }, "presets": { @@ -685,7 +685,7 @@ }, "show_image": { "label": "显示配图", - "info": "若要获得最佳效果，请使用纵横比为 3:2 的图片。[了解详细信息](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" + "info": "若要获得最佳效果，请使用纵横比为 3:2 的图片。[详细了解](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" }, "show_date": { "label": "显示日期" @@ -739,7 +739,7 @@ }, "show_rating": { "label": "显示产品评分", - "info": "若要显示评分，请添加产品评分应用。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-collection-show-product-rating)" + "info": "若要显示评分，请添加产品评分应用。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-collection-show-product-rating)" }, "enable_quick_buy": { "label": "启用快速添加按钮", @@ -854,7 +854,7 @@ "label": "标题" }, "header__1": { - "info": "订阅者已自动添加到您的“已接受营销”客户列表。[了解详细信息](https://help.shopify.com/manual/customers/manage-customers)", + "info": "订阅者已自动添加到您的“已接受营销”客户列表。[详细了解](https://help.shopify.com/manual/customers/manage-customers)", "content": "电子邮件注册信息" }, "header__2": { @@ -900,7 +900,7 @@ }, "header__9": { "content": "在 Shop 中关注", - "info": "若要使客户能够通过您的店面在 Shop 应用中关注您的商店，则必须启用 Shop Pay。[了解详细信息](https://help.shopify.com/manual/online-store/themes/customizing-themes/follow-on-shop)" + "info": "若要使客户能够通过您的店面在 Shop 应用中关注您的商店，则必须启用 Shop Pay。[详细了解](https://help.shopify.com/manual/online-store/themes/customizing-themes/follow-on-shop)" }, "enable_follow_on_shop": { "label": "启用在 Shop 中关注" @@ -1035,7 +1035,7 @@ "options__3": { "label": "中" }, - "info": "若要获得最佳效果，请使用纵横比为 3:2 的图片。[了解详细信息](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", + "info": "若要获得最佳效果，请使用纵横比为 3:2 的图片。[详细了解](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", "options__4": { "label": "大" } @@ -1338,7 +1338,7 @@ "options__3": { "label": "中" }, - "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[了解详细信息](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", + "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[详细了解](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)", "options__4": { "label": "大" } @@ -1386,7 +1386,7 @@ "label": "显示配图" }, "paragraph": { - "content": "通过编辑博客文章来更改摘录。[了解详细信息](https://help.shopify.com/manual/online-store/blogs/writing-blogs#display-an-excerpt-from-a-blog-post)" + "content": "通过编辑博客文章来更改摘录。[详细了解](https://help.shopify.com/manual/online-store/blogs/writing-blogs#display-an-excerpt-from-a-blog-post)" }, "show_date": { "label": "显示日期" @@ -1418,7 +1418,7 @@ "options__4": { "label": "大" }, - "info": "若要获得最佳效果，请使用纵横比为 3:2 的图片。[了解详细信息](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" + "info": "若要获得最佳效果，请使用纵横比为 3:2 的图片。[详细了解](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" } } }, @@ -1440,14 +1440,14 @@ "name": "产品系列横幅", "settings": { "paragraph": { - "content": "通过编辑产品系列来添加描述或图片。[了解详细信息](https://help.shopify.com/manual/products/collections/collection-layout)" + "content": "通过编辑产品系列来添加描述或图片。[详细了解](https://help.shopify.com/manual/products/collections/collection-layout)" }, "show_collection_description": { "label": "显示产品系列描述" }, "show_collection_image": { "label": "显示产品系列图片", - "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[了解详细信息](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" + "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[详细了解](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" } } }, @@ -1480,11 +1480,11 @@ }, "enable_tags": { "label": "启用筛选", - "info": "使用 Search & Discovery 应用自定义筛选条件。[了解详细信息](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" + "info": "使用 Search & Discovery 应用自定义筛选条件。[详细了解](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" }, "enable_filtering": { "label": "启用筛选", - "info": "使用 Search & Discovery 应用自定义筛选条件。[了解详细信息](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" + "info": "使用 Search & Discovery 应用自定义筛选条件。[详细了解](https://help.shopify.com/manual/online-store/search-and-discovery/filters)" }, "enable_sorting": { "label": "启用排序" @@ -1494,7 +1494,7 @@ }, "show_rating": { "label": "显示产品评分", - "info": "若要显示评分，请添加产品评分应用。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-grid-section-settings)" + "info": "若要显示评分，请添加产品评分应用。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-grid-section-settings)" }, "enable_quick_buy": { "label": "启用快速添加按钮", @@ -1568,7 +1568,7 @@ "options__3": { "label": "方形" }, - "info": "通过编辑产品集合来添加图片。[了解详细信息](https://help.shopify.com/manual/products/collections)" + "info": "通过编辑产品集合来添加图片。[详细了解](https://help.shopify.com/manual/products/collections)" }, "columns_desktop": { "label": "台式设备上的列数" @@ -1628,18 +1628,31 @@ "name": "文本" }, "variant_picker": { + "name": "多属性选择器", "settings": { "picker_type": { - "label": "类型", + "label": "样式", "options__1": { "label": "下拉菜单" }, "options__2": { "label": "椭圆形框" } + }, + "swatch_shape": { + "label": "样本", + "info": "了解如何显示 [样本](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "圆形" + }, + "options__2": { + "label": "方形" + }, + "options__3": { + "label": "无" + } } - }, - "name": "多属性选择器" + } }, "buy_buttons": { "settings": { @@ -1649,7 +1662,7 @@ }, "show_gift_card_recipient": { "label": "显示礼品卡的收件人信息表单", - "info": "允许客户在预定日期发送礼品卡并附加私人消息。[了解详细信息](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" + "info": "允许客户在预定日期发送礼品卡并附加私人消息。[详细了解](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" } }, "name": "Buy Button" @@ -1848,7 +1861,7 @@ "name": "产品评分", "settings": { "paragraph": { - "content": "若要显示评分，请添加产品评分应用。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-rating-block)" + "content": "若要显示评分，请添加产品评分应用。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-rating-block)" } } }, @@ -1856,7 +1869,7 @@ "name": "互补产品", "settings": { "paragraph": { - "content": "若要选择互补产品，请添加 Search & Discovery 应用。[了解详细信息](https://help.shopify.com/manual/online-store/search-and-discovery/product-recommendations)" + "content": "若要选择互补产品，请添加 Search & Discovery 应用。[详细了解](https://help.shopify.com/manual/online-store/search-and-discovery/product-recommendations)" }, "heading": { "label": "标题" @@ -2113,7 +2126,7 @@ }, "show_rating": { "label": "显示产品评分", - "info": "若要显示评分，请添加产品评分应用。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#search-results-section-settings)" + "info": "若要显示评分，请添加产品评分应用。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#search-results-section-settings)" }, "columns_desktop": { "label": "桌面上的列数" @@ -2241,7 +2254,7 @@ "label": "使分区展示全宽" }, "paragraph": { - "content": "每次电子邮件订阅均会创建一个客户账户。[了解详细信息](https://help.shopify.com/manual/customers)" + "content": "每次电子邮件订阅均会创建一个客户账户。[详细了解](https://help.shopify.com/manual/customers)" } }, "blocks": { @@ -2414,7 +2427,7 @@ }, "description": { "label": "视频替代文本", - "info": "为使用屏幕阅读器的客户描述视频。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#video)" + "info": "为使用屏幕阅读器的客户描述视频。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#video)" }, "image_padding": { "label": "添加图片填充", @@ -2482,13 +2495,26 @@ "name": "多属性选择器", "settings": { "picker_type": { - "label": "类型", + "label": "样式", "options__1": { "label": "下拉菜单" }, "options__2": { "label": "椭圆形框" } + }, + "swatch_shape": { + "label": "样本", + "info": "了解如何显示 [样本](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "圆形" + }, + "options__2": { + "label": "方形" + }, + "options__3": { + "label": "无" + } } } }, @@ -2497,7 +2523,7 @@ "settings": { "show_dynamic_checkout": { "label": "显示动态结账按钮", - "info": "通过使用您商店中提供的付款方式，客户会看到他们的首选付款方式，例如 PayPal 或 Apple Pay。[了解详细信息](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)" + "info": "通过使用您商店中提供的付款方式，客户会看到他们的首选付款方式，例如 PayPal 或 Apple Pay。[详细了解](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)" } } }, @@ -2508,10 +2534,10 @@ "name": "分享", "settings": { "featured_image_info": { - "content": "如果您在社交媒体帖子中包含链接，该页面的配图将作为预览图片显示。[了解详细信息](https://help.shopify.com/manual/online-store/images/showing-social-media-thumbnail-images)" + "content": "如果您在社交媒体帖子中包含链接，该页面的配图将作为预览图片显示。[详细了解](https://help.shopify.com/manual/online-store/images/showing-social-media-thumbnail-images)" }, "title_info": { - "content": "预览图片中包含商店标题和描述。[了解详细信息](https://help.shopify.com/manual/promoting-marketing/seo/adding-keywords#set-a-title-and-description-for-your-online-store)" + "content": "预览图片中包含商店标题和描述。[详细了解](https://help.shopify.com/manual/promoting-marketing/seo/adding-keywords#set-a-title-and-description-for-your-online-store)" }, "text": { "label": "文本" @@ -2522,7 +2548,7 @@ "name": "产品评分", "settings": { "paragraph": { - "content": "若要显示评分，请添加产品评分应用。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-product-rating)" + "content": "若要显示评分，请添加产品评分应用。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-product-rating)" } } }, @@ -2580,7 +2606,7 @@ "name": "电子邮件注册横幅", "settings": { "paragraph": { - "content": "每次电子邮件订阅均会创建一个客户账户。[了解详细信息](https://help.shopify.com/manual/customers)" + "content": "每次电子邮件订阅均会创建一个客户账户。[详细了解](https://help.shopify.com/manual/customers)" }, "image": { "label": "背景图片" @@ -2596,7 +2622,7 @@ }, "show_text_below": { "label": "在移动设备上的图片下方显示内容。", - "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[了解详细信息](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" + "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[详细了解](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" }, "image_height": { "label": "横幅高度", @@ -2612,7 +2638,7 @@ "options__4": { "label": "大" }, - "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[了解详细信息](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" + "info": "若要获得最佳效果，请使用纵横比为 16:9 的图片。[详细了解](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)" }, "desktop_content_position": { "options__4": { @@ -3116,7 +3142,7 @@ "label": "台式设备上的列数" }, "paragraph__1": { - "content": "动态推荐使用订单和产品信息来随着时间而变化和改进。[了解详细信息](https://help.shopify.com/themes/development/recommended-products)" + "content": "动态推荐使用订单和产品信息来随着时间而变化和改进。[详细了解](https://help.shopify.com/themes/development/recommended-products)" }, "header__2": { "content": "产品卡" @@ -3141,7 +3167,7 @@ }, "show_rating": { "label": "显示产品评分", - "info": "若要显示评分，请添加产品评分应用。[了解详细信息](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-recommendations-section-settings)" + "info": "若要显示评分，请添加产品评分应用。[详细了解](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-recommendations-section-settings)" }, "header_mobile": { "content": "移动设备布局" diff --git a/locales/zh-TW.json b/locales/zh-TW.json index 1278e63b1c6..53bd0cec811 100644 --- a/locales/zh-TW.json +++ b/locales/zh-TW.json @@ -206,7 +206,8 @@ "clear_filter": "移除篩選條件", "filter_selected_accessibility": "{{ type }} (已選取 {{ count }} 個篩選條件)", "show_more": "顯示更多內容", - "show_less": "顯示較少內容" + "show_less": "顯示較少內容", + "filter_and_operator_subtitle": "完全符合" } }, "templates": { @@ -364,7 +365,10 @@ "country_label": "國家/地區", "language_label": "語言", "update_language": "更新語言", - "update_country": "更新國家/地區" + "update_country": "更新國家/地區", + "search": "搜尋", + "popular_countries_regions": "常見國家/地區", + "country_results_count": "找到 {{ count }} 個國家/地區" }, "customer": { "account": { diff --git a/locales/zh-TW.schema.json b/locales/zh-TW.schema.json index 028ec149e28..8f2e2bc6f71 100644 --- a/locales/zh-TW.schema.json +++ b/locales/zh-TW.schema.json @@ -319,7 +319,7 @@ "label": "標誌" }, "logo_width": { - "label": "桌面版標誌寬度", + "label": "電腦版標誌寬度", "info": "標誌會自動調整為手機最佳寬度。" }, "favicon": { @@ -486,7 +486,7 @@ "content": "公告" }, "show_social": { - "label": "在桌面顯示圖示" + "label": "在電腦版顯示圖示" }, "header__3": { "content": "國家/地區選擇器", @@ -514,7 +514,7 @@ "label": "標題" }, "desktop_layout": { - "label": "桌面版版面配置", + "label": "電腦版版面配置", "options__1": { "label": "左側大型區塊" }, @@ -621,7 +621,7 @@ "label": "若清單中包含的商品系列比顯示出的更多，請啟用「檢視全部」按鈕" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" }, "header_mobile": { "content": "行動版版面配置" @@ -694,7 +694,7 @@ "label": "顯示作者" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" } }, "presets": { @@ -746,7 +746,7 @@ "info": "最適合彈出式視窗或購物車導覽匣類型。" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" }, "description": { "label": "說明" @@ -779,7 +779,7 @@ "label": "「檢視更多」樣式" }, "enable_desktop_slider": { - "label": "在桌面版啟用輪播廣告" + "label": "在電腦版啟用輪播廣告" }, "full_width": { "label": "讓產品以全寬度呈現" @@ -911,7 +911,7 @@ "name": "標頭", "settings": { "logo_position": { - "label": "桌面版標誌位置", + "label": "電腦版標誌位置", "options__1": { "label": "中央左方" }, @@ -935,7 +935,7 @@ "label": "下方邊界" }, "menu_type_desktop": { - "label": "桌面版選單類型", + "label": "電腦版選單類型", "info": "行動版的選單類型會自動調整大小。", "options__1": { "label": "下拉式選單" @@ -1016,7 +1016,7 @@ "label": "在行動裝置上堆疊圖片" }, "show_text_box": { - "label": "在桌面顯示容器" + "label": "在電腦版顯示容器" }, "image_overlay_opacity": { "label": "圖片疊加層透明度" @@ -1068,7 +1068,7 @@ "options__9": { "label": "下方靠右" }, - "label": "桌面版內容位置" + "label": "電腦版內容位置" }, "desktop_content_alignment": { "options__1": { @@ -1080,7 +1080,7 @@ "options__3": { "label": "靠右" }, - "label": "桌面版內容對齊方式" + "label": "電腦版內容對齊方式" }, "mobile_content_alignment": { "options__1": { @@ -1185,7 +1185,7 @@ "options__2": { "label": "圖片秒數" }, - "label": "桌面版圖片位置", + "label": "電腦版圖片位置", "info": "圖片會先預設為行動版版面配置。" }, "desktop_image_width": { @@ -1198,7 +1198,7 @@ "options__3": { "label": "大" }, - "label": "桌面版圖片寬度", + "label": "電腦版圖片寬度", "info": "行動版的圖片會自動調整大小。" }, "desktop_content_alignment": { @@ -1208,7 +1208,7 @@ "options__3": { "label": "靠右" }, - "label": "桌面版內容對齊方式", + "label": "電腦版內容對齊方式", "options__2": { "label": "置中" } @@ -1223,7 +1223,7 @@ "options__3": { "label": "靠下" }, - "label": "桌面版內容位置" + "label": "電腦版內容位置" }, "content_layout": { "options__1": { @@ -1395,7 +1395,7 @@ "label": "顯示作者" }, "layout": { - "label": "桌面版版面配置", + "label": "電腦版版面配置", "options__1": { "label": "網格" }, @@ -1501,7 +1501,7 @@ "info": "最適合彈出式視窗或購物車導覽匣類型。" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" }, "header_mobile": { "content": "行動版版面配置" @@ -1516,7 +1516,7 @@ } }, "filter_type": { - "label": "桌面版濾鏡版面配置", + "label": "電腦版濾鏡版面配置", "options__1": { "label": "水平" }, @@ -1571,7 +1571,7 @@ "info": "編輯您的商品系列以新增圖片。[瞭解詳情](https://help.shopify.com/manual/products/collections)" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" }, "header_mobile": { "content": "行動版版面配置" @@ -1628,18 +1628,31 @@ "name": "文字" }, "variant_picker": { + "name": "子類選擇器", "settings": { "picker_type": { - "label": "類型", + "label": "樣式", "options__1": { "label": "下拉式選單" }, "options__2": { "label": "圓角" } + }, + "swatch_shape": { + "label": "色樣", + "info": "瞭解如何顯示 [色樣](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "圓形" + }, + "options__2": { + "label": "正方形" + }, + "options__3": { + "label": "無" + } } - }, - "name": "子類選擇器" + } }, "buy_buttons": { "settings": { @@ -1995,13 +2008,13 @@ "label": "啟用影片循環播放功能" }, "enable_sticky_info": { - "label": "在桌面版啟用黏性內容" + "label": "在電腦版啟用黏性內容" }, "hide_variants": { "label": "在選取一個子類後，隱藏其他子類的多媒體檔案" }, "gallery_layout": { - "label": "桌面版版面配置", + "label": "電腦版版面配置", "options__1": { "label": "已堆疊" }, @@ -2016,7 +2029,7 @@ } }, "media_size": { - "label": "桌面版多媒體檔案寬度", + "label": "電腦版多媒體檔案寬度", "options__1": { "label": "小" }, @@ -2041,7 +2054,7 @@ } }, "media_position": { - "label": "桌面版多媒體檔案位置", + "label": "電腦版多媒體檔案位置", "info": "行動版會自動調整為最佳位置。", "options__1": { "label": "靠左" @@ -2116,7 +2129,7 @@ "info": "新增產品評等應用程式，即可顯示評等。[瞭解詳情](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#search-results-section-settings)" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" }, "header_mobile": { "content": "行動版版面配置" @@ -2193,7 +2206,7 @@ "label": "啟用行動裝置的滑動功能" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" }, "header_mobile": { "content": "行動版版面配置" @@ -2296,7 +2309,7 @@ "options__3": { "label": "靠右" }, - "label": "桌面版內容位置", + "label": "電腦版內容位置", "info": "行動版會自動調整為最佳位置。" }, "content_alignment": { @@ -2482,13 +2495,26 @@ "name": "子類選擇器", "settings": { "picker_type": { - "label": "類型", + "label": "樣式", "options__1": { "label": "下拉式選單" }, "options__2": { "label": "圓角" } + }, + "swatch_shape": { + "label": "色樣", + "info": "瞭解如何顯示 [色樣](https://help.shopify.com/en/manual/online-store/themes/theme-structure/theme-settings#options-with-swatches)", + "options__1": { + "label": "圓形" + }, + "options__2": { + "label": "正方形" + }, + "options__3": { + "label": "無" + } } } }, @@ -2559,10 +2585,10 @@ "label": "啟用影片循環播放功能" }, "hide_variants": { - "label": "隱藏桌面版未選擇的子類多媒體檔案" + "label": "隱藏電腦版未選擇的子類多媒體檔案" }, "media_position": { - "label": "桌面版多媒體檔案位置", + "label": "電腦版多媒體檔案位置", "info": "行動版會自動調整為最佳位置。", "options__1": { "label": "靠左" @@ -2589,7 +2615,7 @@ "label": "顯示背景圖片" }, "show_text_box": { - "label": "在桌面顯示容器" + "label": "在電腦版顯示容器" }, "image_overlay_opacity": { "label": "圖片疊加層透明度" @@ -2642,7 +2668,7 @@ "options__3": { "label": "上方靠右" }, - "label": "桌面版內容位置" + "label": "電腦版內容位置" }, "desktop_content_alignment": { "options__1": { @@ -2654,7 +2680,7 @@ "options__3": { "label": "靠右" }, - "label": "桌面版內容對齊方式" + "label": "電腦版內容對齊方式" }, "header": { "content": "行動版版面配置" @@ -2790,7 +2816,7 @@ "label": "使用外框按鈕樣式" }, "box_align": { - "label": "桌面版內容位置", + "label": "電腦版內容位置", "options__1": { "label": "上方靠左" }, @@ -2821,10 +2847,10 @@ "info": "行動版會自動調整為最佳位置。" }, "show_text_box": { - "label": "在桌面顯示容器" + "label": "在電腦版顯示容器" }, "text_alignment": { - "label": "桌面版內容對齊方式", + "label": "電腦版內容對齊方式", "option_1": { "label": "靠左" }, @@ -2916,7 +2942,7 @@ } }, "desktop_layout": { - "label": "桌面版版面配置", + "label": "電腦版版面配置", "options__1": { "label": "先顯示圖片" }, @@ -3113,7 +3139,7 @@ "label": "商品數量顯示上限" }, "columns_desktop": { - "label": "桌面版的欄數" + "label": "電腦版的欄數" }, "paragraph__1": { "content": "動態推薦會使用訂單和商品資訊，以隨著時間改變與改進。[瞭解詳情](https://help.shopify.com/themes/development/recommended-products)" @@ -3188,7 +3214,7 @@ "options__3": { "label": "大" }, - "label": "桌面版圖片寬度", + "label": "電腦版圖片寬度", "info": "行動版的圖片會自動調整大小。" }, "heading_size": { @@ -3231,7 +3257,7 @@ "options__3": { "label": "靠右" }, - "label": "桌面版內容對齊方式" + "label": "電腦版內容對齊方式" }, "desktop_content_position": { "options__1": { @@ -3243,7 +3269,7 @@ "options__3": { "label": "靠下" }, - "label": "桌面版內容位置", + "label": "電腦版內容位置", "info": "行動版會自動調整為最佳位置。" }, "image_layout": { @@ -3259,7 +3285,7 @@ "options__4": { "label": "靠右對齊" }, - "label": "桌面版圖片位置", + "label": "電腦版圖片位置", "info": "行動版的圖片會自動調整位置。" }, "container_color_scheme": { diff --git a/release-notes.md b/release-notes.md index d4dc701125b..ee0a2c2505f 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,24 +1,23 @@ -Dawn 11.0.0 introduces new customization options to the announcement bar, new animations and hover effects, and a Quick order list section to product pages. +Dawn 12.0.0 introduces additional customization options by adding color scheme pickers to new areas, and new ways to visually display product filters. It also introduces some performance improvements related to image loading. ### Added -- You can now add multiple Announcement bar sections to your Header. -- You can now display social media icons in the Announcement bar. -- You can now add the country/region selector and the language selector to the Announcement bar. -- You can now set a different color scheme for your navigation menu than for your Header. -- We added a new “Zoom in on scroll” animation option to the Image with text and Image banner sections. -- We added a new “Vertical lift” hover effect option to cards and buttons. -- You can now apply the outline button style to the button on Image with text. -- You can now adjust the bottom padding on the Subtotal section in the cart. -- We introduced a new Quick order list section to the product template. This allows you to optimize your product pages for bulk buying. -- Customers who qualify for volume pricing will now see the different price breaks on your product pages. +- Important: If you use a gradient as a main background, the look of your cart drawer and product modal (quick add) will be affected. +- You can now select a color scheme for the Image with text section, Collection template (Product grid section), Product information section, Cart drawer, and Cart page. ### Changed -- We reduced the height of the Announcement bar section. -- You can now choose to auto rotate the Announcement bar slides every 3 seconds. The minimum was previously 5 seconds. -- Your mobile menu drawer will now appear full-width. -- The Featured collection section will now display placeholder product images until a collection is selected. +- If you are using the Search & Discovery app, you can now change the logical operator for facet filter values between OR and AND. +- If you are using the Search & Discovery app, you can now choose to apply a swatch visual style for certain filter types (references to metaobjects). ### Fixes and improvements -- We fixed a bug where text links were not styled properly in the heading of the Related products section. -- We made light stylistic improvements to link styles, alignment and spacing for both the dropdown and mega menu types in the Header. -- We fixed a bug where the Footer would display extra white space when the “Show email signup” setting was left unchecked. \ No newline at end of file +- We fixed an issue with facet filters that affected currencies that use comma separators. +- We fixed a formatting issue with metadata that is used for SEO purposes. +- We fixed a visual bug that was affecting the collage section. +- We fixed an issue with the “compare at” price to ensure more predictable behavior. +- We’ve improved the experience of adding items to cart on slower connections. +- We fixed a styling issue affecting collections in empty cart drawers. +- We fixed an issue in the Slideshow section where the next slide flashes before coming into view. +- We’ve improved various visual elements on the Quick order list including font consistency, alignment, and spacing. +- We fixed an issue affecting Quick order list on iOS, removing the need to double tap the info icon to open it. + +### Removed +- Removed image tag attribute that indicated which images to load first. We will now allow the platform to determine this, which will improve performance. \ No newline at end of file diff --git a/sections/announcement-bar.liquid b/sections/announcement-bar.liquid index 92426f1261d..31db1f58257 100644 --- a/sections/announcement-bar.liquid +++ b/sections/announcement-bar.liquid @@ -126,6 +126,12 @@ {%- if request.design_mode -%} + {%- endif -%} {%- endif -%}
@@ -225,7 +231,7 @@ "type": "color_scheme", "id": "color_scheme", "label": "t:sections.all.colors.label", - "default": "accent-1" + "default": "scheme-4" }, { "type": "checkbox", diff --git a/sections/collage.liquid b/sections/collage.liquid index 39551f05635..ae7da8c9b3a 100644 --- a/sections/collage.liquid +++ b/sections/collage.liquid @@ -68,7 +68,6 @@ block.settings.image | image_url: width: 3200 | image_tag: - loading: 'lazy', sizes: sizes, widths: '50, 75, 100, 150, 200, 300, 400, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, 3200' }} @@ -82,7 +81,6 @@ block.settings.image | image_url: width: 3200 | image_tag: - loading: 'lazy', sizes: sizes, widths: '50, 75, 100, 150, 200, 300, 400, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, 3200' }} @@ -141,7 +139,7 @@ {{ block.settings.cover_image | image_url: width: 3000 - | image_tag: loading: 'lazy', sizes: sizes, widths: '550, 720, 990, 1100, 1500, 2200, 3000' + | image_tag: sizes: sizes, widths: '550, 720, 990, 1100, 1500, 2200, 3000' }} {%- else -%} {{ 'hero-apparel-3' | placeholder_svg_tag: 'placeholder-svg placeholder' }} @@ -185,7 +183,7 @@ {{ block.settings.cover_image | image_url: width: 3000 - | image_tag: loading: 'lazy', sizes: sizes, widths: '550, 720, 990, 1100, 1500, 2200, 3000' + | image_tag: sizes: sizes, widths: '550, 720, 990, 1100, 1500, 2200, 3000' }} {%- else -%} {{ 'hero-apparel-3' | placeholder_svg_tag: 'placeholder-svg placeholder' }} @@ -335,7 +333,7 @@ "id": "color_scheme", "label": "t:sections.all.colors.label", "info": "t:sections.all.colors.has_cards_info", - "default": "background-1" + "default": "scheme-1" }, { "type": "header", diff --git a/sections/collapsible-content.liquid b/sections/collapsible-content.liquid index 6dee94dc51b..a2d923d2c0c 100644 --- a/sections/collapsible-content.liquid +++ b/sections/collapsible-content.liquid @@ -62,7 +62,6 @@ section.settings.image | image_url: width: 3200 | image_tag: - loading: 'lazy', sizes: sizes, widths: '50, 75, 100, 150, 200, 300, 400, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, 3200' }} @@ -191,14 +190,14 @@ "type": "color_scheme", "id": "color_scheme", "label": "t:sections.all.colors.label", - "default": "background-1" + "default": "scheme-1" }, { "type": "color_scheme", "id": "container_color_scheme", "label": "t:sections.collapsible_content.settings.container_color_scheme.label", "info": "t:sections.collapsible_content.settings.container_color_scheme.info", - "default": "background-2" + "default": "scheme-2" }, { "type": "checkbox", diff --git a/sections/collection-list.liquid b/sections/collection-list.liquid index b94cdac159d..828f9f7e448 100644 --- a/sections/collection-list.liquid +++ b/sections/collection-list.liquid @@ -200,7 +200,7 @@ "id": "color_scheme", "label": "t:sections.all.colors.label", "info": "t:sections.all.colors.has_cards_info", - "default": "background-1" + "default": "scheme-1" }, { "type": "checkbox", diff --git a/sections/contact-form.liquid b/sections/contact-form.liquid index 99d4f4eb919..e545933c533 100644 --- a/sections/contact-form.liquid +++ b/sections/contact-form.liquid @@ -172,7 +172,7 @@ "type": "color_scheme", "id": "color_scheme", "label": "t:sections.all.colors.label", - "default": "background-1" + "default": "scheme-1" }, { "type": "header", diff --git a/sections/custom-liquid.liquid b/sections/custom-liquid.liquid index 7faf4560003..869a5b795d4 100644 --- a/sections/custom-liquid.liquid +++ b/sections/custom-liquid.liquid @@ -33,7 +33,7 @@ "type": "color_scheme", "id": "color_scheme", "label": "t:sections.all.colors.label", - "default": "background-1" + "default": "scheme-1" }, { "type": "header", diff --git a/sections/email-signup-banner.liquid b/sections/email-signup-banner.liquid index 4c76172f80c..464637c9ea2 100644 --- a/sections/email-signup-banner.liquid +++ b/sections/email-signup-banner.liquid @@ -267,7 +267,7 @@ "id": "color_scheme", "label": "t:sections.all.colors.label", "info": "t:sections.email-signup-banner.settings.color_scheme.info", - "default": "background-1" + "default": "scheme-1" }, { "type": "header", diff --git a/sections/featured-blog.liquid b/sections/featured-blog.liquid index 7829f704527..d96a8762f10 100644 --- a/sections/featured-blog.liquid +++ b/sections/featured-blog.liquid @@ -244,7 +244,7 @@ "id": "color_scheme", "label": "t:sections.all.colors.label", "info": "t:sections.all.colors.has_cards_info", - "default": "background-1" + "default": "scheme-1" }, { "type": "checkbox", diff --git a/sections/featured-collection.liquid b/sections/featured-collection.liquid index c582f39b19c..047f025e3e3 100644 --- a/sections/featured-collection.liquid +++ b/sections/featured-collection.liquid @@ -98,7 +98,7 @@ %} {%- else -%} - {%- for i in (1..4) -%} + {%- for i in (1..section.settings.columns_desktop) -%}
  • - {%- assign placeholder_image = 'product-apparel-' | append: forloop.rindex -%} + {% liquid + assign ridx = forloop.rindex + if ridx == 5 + assign ridx = 1 + endif + %} + {%- assign placeholder_image = 'product-apparel-' | append: ridx -%} {% render 'card-product', show_vendor: section.settings.show_vendor, + media_aspect_ratio: section.settings.image_ratio, + image_shape: section.settings.image_shape, placeholder_image: placeholder_image %}
    • @@ -294,7 +302,7 @@ "id": "color_scheme", "label": "t:sections.all.colors.label", "info": "t:sections.all.colors.has_cards_info", - "default": "background-1" + "default": "scheme-1" }, { "type": "header", diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid index 5bb47fcf8ba..94e122224fb 100644 --- a/sections/featured-product.liquid +++ b/sections/featured-product.liquid @@ -2,10 +2,14 @@ {{ 'section-featured-product.css' | asset_url | stylesheet_tag }} {{ 'component-accordion.css' | asset_url | stylesheet_tag }} {{ 'component-price.css' | asset_url | stylesheet_tag }} -{{ 'component-loading-overlay.css' | asset_url | stylesheet_tag }} {{ 'component-deferred-media.css' | asset_url | stylesheet_tag }} {{ 'component-rating.css' | asset_url | stylesheet_tag }} {{ 'component-volume-pricing.css' | asset_url | stylesheet_tag }} +{% unless section.settings.product.has_only_default_variant %} + {{ 'component-product-variant-picker.css' | asset_url | stylesheet_tag }} + {{ 'component-swatch.css' | asset_url | stylesheet_tag }} + {{ 'component-swatch-input.css' | asset_url | stylesheet_tag }} +{% endunless %} {%- style -%} .section-{{ section.id }}-padding { @@ -224,19 +228,7 @@