diff --git a/locales/da.schema.json b/locales/da.schema.json index 75d9417f1c3..5a5af8bc113 100644 --- a/locales/da.schema.json +++ b/locales/da.schema.json @@ -473,10 +473,10 @@ }, "settings": { "auto_rotate": { - "label": "Roter meddelelser automatisk" + "label": "Roter automatisk slides" }, "change_slides_speed": { - "label": "Skift hver" + "label": "Skift slide hver" }, "header__1": { "content": "Ikoner for sociale medier", @@ -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" @@ -1658,8 +1658,8 @@ "info": "Via de tilgængelige betalingsmetoder i din butik ser kunderne deres foretrukne mulighed, som f.eks. PayPal eller Apple Pay. [Få mere at vide](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)" }, "show_gift_card_recipient": { - "label": "Vis formularer til modtageroplysninger for gavekort", - "info": "Giver købere mulighed for at sende gavekort på en planlagt dato sammen med en personlig besked. [Få mere at vide](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" + "label": "Vis formular til modtageroplysninger for gavekortprodukter", + "info": "Gavekortprodukter kan sendes direkte til modtageren sammen med en personlig besked. [Få mere at vide](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" } } }, diff --git a/locales/de.json b/locales/de.json index 2b3edf36f81..4da32191fe6 100644 --- a/locales/de.json +++ b/locales/de.json @@ -478,7 +478,7 @@ }, "gift_cards": { "issued": { - "title": "Hier ist dein {{ value }}-Geschenkgutschein für {{ shop }}!", + "title": "Hier ist dein {{ value }}-Gutschein für {{ shop }}!", "subtext": "Dein Geschenkgutschein", "gift_card_code": "Gutscheincode", "shop_link": "Onlineshop besuchen", diff --git a/locales/de.schema.json b/locales/de.schema.json index f6bffbd66f2..328590568c6 100644 --- a/locales/de.schema.json +++ b/locales/de.schema.json @@ -473,10 +473,10 @@ }, "settings": { "auto_rotate": { - "label": "Autorotieren der Ankündigungen" + "label": "Autorotieren der Slides" }, "change_slides_speed": { - "label": "Ändern alle" + "label": "Anzeige der nächsten Folie alle" }, "header__1": { "content": "Social-Media-Symbole", @@ -1657,8 +1657,8 @@ "info": "Wenn sie die Zahlungsmethoden verwenden, die in deinem Shop verfügbar sind, sehen Kunden ihre bevorzugte Option, z. B. PayPal oder Apple Pay. [Mehr Informationen](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)" }, "show_gift_card_recipient": { - "label": "Formular für Empfängerinformationen für Geschenkgutscheine anzeigen", - "info": "So können Käufer Geschenkgutscheine an einem bestimmten Datum mit einer persönlichen Nachricht versenden. [Mehr Informationen](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" + "label": "Formular für Empfängerinformationen für Gutscheine anzeigen", + "info": "Gutscheine können optional mit einer persönlichen Nachricht an einen Empfänger gesendet werden. [Mehr Informationen](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" } } }, diff --git a/locales/fr.schema.json b/locales/fr.schema.json index e4fc2042d5a..c99ae5fc4dc 100644 --- a/locales/fr.schema.json +++ b/locales/fr.schema.json @@ -473,10 +473,10 @@ }, "settings": { "auto_rotate": { - "label": "Rotation automatique des annonces" + "label": "Rotation automatique des diapositives" }, "change_slides_speed": { - "label": "Changer toutes les" + "label": "Changer de diapositive toutes les" }, "header__1": { "content": "Icônes de réseaux sociaux", @@ -1658,7 +1658,7 @@ }, "show_gift_card_recipient": { "label": "Afficher le formulaire d’information sur le destinataire pour les cartes‑cadeaux", - "info": "Permet aux acheteurs d’envoyer des cartes-cadeaux à une date prévue ainsi qu’un message personnel. [En savoir plus](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" + "info": "Les cartes‑cadeaux peuvent être envoyées directement au destinataire, accompagnées d’un message personnel. [En savoir plus](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" } } }, diff --git a/locales/pt-PT.schema.json b/locales/pt-PT.schema.json index 8ef6e3f1278..29626092652 100644 --- a/locales/pt-PT.schema.json +++ b/locales/pt-PT.schema.json @@ -429,7 +429,7 @@ "content": "Animações", "image_behavior": { "options__1": { - "label": "Nenhum" + "label": "Nenhum(a)" }, "options__2": { "label": "Movimento de ambiente" @@ -473,10 +473,10 @@ }, "settings": { "auto_rotate": { - "label": "Rotação automática de comunicados" + "label": "Rotação automática de diapositivos" }, "change_slides_speed": { - "label": "Mudar a cada" + "label": "Mudar diapositivos a cada" }, "header__1": { "content": "Ícones de redes sociais", @@ -1648,8 +1648,8 @@ "info": "Utilizando os métodos de pagamento disponíveis na sua loja, os clientes poderão ver a sua opção preferida, como o PayPal ou Apple Pay. [Saiba mais](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)" }, "show_gift_card_recipient": { - "label": "Apresentar o formulário de informações do destinatário para cartões de oferta", - "info": "Permite aos compradores enviar cartões de oferta numa data agendada juntamente com uma mensagem pessoal. [Saber mais](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" + "label": "Apresentar o formulário de informações do destinatário para produtos de cartões de oferta", + "info": "Os produtos de cartões de oferta podem ser opcionalmente enviados a um destinatário com uma mensagem pessoal. [Saber mais](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" } }, "name": "Botão de compra" diff --git a/locales/zh-CN.schema.json b/locales/zh-CN.schema.json index 78a321ef1e5..7840807401e 100644 --- a/locales/zh-CN.schema.json +++ b/locales/zh-CN.schema.json @@ -473,10 +473,10 @@ }, "settings": { "auto_rotate": { - "label": "自动循环展示公告" + "label": "自动旋转幻灯片" }, "change_slides_speed": { - "label": "更换时间间隔" + "label": "幻灯片更换时间间隔" }, "header__1": { "content": "社交媒体图标", @@ -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 中关注" @@ -1648,8 +1648,8 @@ "info": "通过使用您商店中提供的付款方式，客户会看到他们的首选付款方式，例如 PayPal 或 Apple Pay。[了解详细信息](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)" }, "show_gift_card_recipient": { - "label": "显示礼品卡的收件人信息表单", - "info": "允许客户在预定日期发送礼品卡并附加私人消息。[了解详细信息](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" + "label": "显示礼品卡产品的收件人信息表单", + "info": "客户可以选择直接将礼品卡产品发送给收件人并附加私人消息。[详细了解](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)" } }, "name": "Buy Button" diff --git a/sections/collage.liquid b/sections/collage.liquid index 5273a6ce177..89967dd6c08 100644 --- a/sections/collage.liquid +++ b/sections/collage.liquid @@ -91,23 +91,75 @@ {%- when 'product' -%} + {% liquid + assign is_large_block = false + if forloop.first and section.settings.desktop_layout == 'left' + assign is_large_block = true + elsif forloop.last and section.settings.desktop_layout == 'right' + assign is_large_block = true + endif + + if section.blocks.size > 1 + if is_large_block + assign columns_amount_desktop = 1.5 + else + assign columns_amount_desktop = 3 + endif + endif + + assign columns_amount_mobile = 1 + if section.settings.mobile_layout == 'collage' and section.blocks.size > 1 + unless section.blocks.size == 3 and is_large_block + assign columns_amount_mobile = 2 + endunless + endif + %} + {%- assign placeholder_image = 'product-apparel-' | append: placeholder_image_index -%} + {% render 'card-product', card_product: block.settings.product, media_aspect_ratio: 'adapt', show_secondary_image: block.settings.second_image, extend_height: true, - placeholder_image: placeholder_image + placeholder_image: placeholder_image, + columns_desktop: columns_amount_desktop, + columns_mobile: columns_amount_mobile %} {%- when 'collection' -%} {%- assign placeholder_image = 'collection-apparel-' | append: placeholder_image_index -%} + {% liquid + assign is_large_block = false + if forloop.first and section.settings.desktop_layout == 'left' + assign is_large_block = true + elsif forloop.last and section.settings.desktop_layout == 'right' + assign is_large_block = true + endif + + if section.blocks.size > 1 + if is_large_block + assign columns_amount_desktop = 1.5 + else + assign columns_amount_desktop = 3 + endif + endif + + assign columns_amount_mobile = 1 + if section.settings.mobile_layout == 'collage' and section.blocks.size > 1 + unless section.blocks.size == 3 and is_large_block + assign columns_amount_mobile = 2 + endunless + endif + %} {% render 'card-collection', card_collection: block.settings.collection, media_aspect_ratio: 'adapt', columns: 2, extend_height: true, wrapper_class: section.settings.card_styles, - placeholder_image: placeholder_image + placeholder_image: placeholder_image, + columns_desktop: columns_amount_desktop, + columns_mobile: columns_amount_mobile %} {%- when 'video' -%}
diff --git a/sections/collection-list.liquid b/sections/collection-list.liquid index b94cdac159d..7f9d36c92c5 100644 --- a/sections/collection-list.liquid +++ b/sections/collection-list.liquid @@ -54,12 +54,6 @@ id="Slider-{{ section.id }}" role="list" > - {%- liquid - assign columns = section.blocks.size - if columns > 3 - assign columns = 3 - endif - -%} {%- for block in section.blocks -%}
  • {%- endfor -%} diff --git a/sections/featured-collection.liquid b/sections/featured-collection.liquid index c582f39b19c..c2289a60d5d 100644 --- a/sections/featured-collection.liquid +++ b/sections/featured-collection.liquid @@ -87,6 +87,8 @@ {% endif %} > {% render 'card-product', + columns_desktop: section.settings.columns_desktop, + columns_mobile: section.settings.columns_mobile, card_product: product, media_aspect_ratio: section.settings.image_ratio, image_shape: section.settings.image_shape, diff --git a/sections/main-collection-product-grid.liquid b/sections/main-collection-product-grid.liquid index 6a449836d78..b7b60fa6c1f 100644 --- a/sections/main-collection-product-grid.liquid +++ b/sections/main-collection-product-grid.liquid @@ -167,6 +167,8 @@ {% endif %} > {% render 'card-product', + columns_desktop: section.settings.columns_desktop, + columns_mobile: section.settings.columns_mobile, card_product: product, media_aspect_ratio: section.settings.image_ratio, image_shape: section.settings.image_shape, diff --git a/sections/main-list-collections.liquid b/sections/main-list-collections.liquid index acd38e6adf2..217aeb76f50 100644 --- a/sections/main-list-collections.liquid +++ b/sections/main-list-collections.liquid @@ -37,9 +37,10 @@ {% endif %} > {% render 'card-collection', + columns_desktop: section.settings.columns_desktop, + columns_mobile: section.settings.columns_mobile, card_collection: collection, - media_aspect_ratio: section.settings.image_ratio, - columns: 3 + media_aspect_ratio: section.settings.image_ratio %}
    • {%- endfor -%} diff --git a/sections/main-product.liquid b/sections/main-product.liquid index 8b9e9fc9b4c..6870c6c368f 100644 --- a/sections/main-product.liquid +++ b/sections/main-product.liquid @@ -497,7 +497,9 @@ show_quick_add: block.settings.enable_quick_add, section_id: section.id, horizontal_class: true, - horizontal_quick_add: true + horizontal_quick_add: true, + columns_desktop: 10, + columns_mobile: 5 %} {%- endfor -%} diff --git a/sections/main-search.liquid b/sections/main-search.liquid index 7b225a89549..5d9c83b21cb 100644 --- a/sections/main-search.liquid +++ b/sections/main-search.liquid @@ -226,6 +226,8 @@ {%- when 'product' -%} {%- capture product_settings -%}{%- if section.settings.product_show_vendor -%}vendor,{%- endif -%}title,price{%- endcapture -%} {% render 'card-product', + columns_desktop: section.settings.columns_desktop, + columns_mobile: section.settings.columns_mobile, card_product: item, media_aspect_ratio: section.settings.image_ratio, image_shape: section.settings.image_shape, diff --git a/sections/related-products.liquid b/sections/related-products.liquid index 610e0d31144..9f7a5832c32 100644 --- a/sections/related-products.liquid +++ b/sections/related-products.liquid @@ -36,6 +36,8 @@ {% for recommendation in recommendations.products %}
  • {% render 'card-product', + columns_desktop: section.settings.columns_desktop, + columns_mobile: section.settings.columns_mobile, card_product: recommendation, media_aspect_ratio: section.settings.image_ratio, image_shape: section.settings.image_shape, diff --git a/snippets/card-collection.liquid b/snippets/card-collection.liquid index f5b879e131b..8764ff985e7 100644 --- a/snippets/card-collection.liquid +++ b/snippets/card-collection.liquid @@ -4,7 +4,8 @@ Accepts: - card_collection: {Object} Collection Liquid object - media_aspect_ratio: {String} Size of the product image card. Values are "square" and "portrait". Default is "square" (optional) - - columns: {Number} + - columns_desktop: {Number} Number of columns on desktop. Default: 3 (optional) + - columns_mobile: {Number} Number of columns on mobile. Default: 2 (optional) - extend_height: {Boolean} Card height extends to available container space. Default: false (optional) - wrapper_class: {String} Wrapper class for card (optional) - placeholder_image: {String} Placeholder image when collection is empty (optional) @@ -29,6 +30,8 @@ assign card_color_scheme = settings.collection_card_color_scheme assign card_style = settings.collection_card_style endif + assign columns_amount_desktop = columns_desktop | at_least: 1 + assign columns_amount_mobile = columns_mobile | at_least: 1 -%}
    @@ -63,8 +66,8 @@ " src="{{ card_collection.featured_image | image_url: width: 1500 }}" sizes=" - (min-width: {{ settings.page_width }}px) {{ settings.page_width | minus: 100 | divided_by: columns }}px, - (min-width: 750px) {% if columns > 1 %}calc((100vw - 10rem) / 2){% else %}calc(100vw - 10rem){% endif %}, + (min-width: {{ settings.page_width }}px) {{ settings.page_width | minus: 100 | divided_by: columns_amount_desktop }}px, + (min-width: 750px) {% if columns_amount_mobile > 1 %}calc((100vw - 10rem) / 2){% else %}calc(100vw - 10rem){% endif %}, calc(100vw - 3rem) " alt="" diff --git a/snippets/card-product.liquid b/snippets/card-product.liquid index b8be5fb6b86..c8ad9ec3d4d 100644 --- a/snippets/card-product.liquid +++ b/snippets/card-product.liquid @@ -15,6 +15,8 @@ - horizontal_class: {Boolean} Add a card--horizontal class if set to true. Default: false (optional) - horizontal_quick_add: {Boolean} Changes the quick add button styles when set to true. Default: false (optional) - placeholder_image: {String} The placeholder image to use when no product exists. Default: 'product-apparel-2' (optional) + - columns_desktop: {Number} Number of columns on desktop. Default: 4 (optional) + - columns_mobile: {Number} Number of columns on mobile. Default: 2 (optional) Usage: {% render 'card-product', show_vendor: section.settings.show_vendor %} @@ -34,6 +36,8 @@ if ratio == 0 or ratio == null assign ratio = 1 endif + assign columns_amount_desktop = columns_desktop | at_least: 1 + assign columns_amount_mobile = columns_mobile | at_least: 1 -%}
    {%- if settings.cart_drawer_collection != blank -%}
    - {% render 'card-collection', card_collection: settings.cart_drawer_collection, columns: 1 %} + {% render 'card-collection', + card_collection: settings.cart_drawer_collection, + columns_desktop: 5, + columns_mobile: 2 + %}
    {%- endif -%}