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/sections/image-with-text.liquid b/sections/image-with-text.liquid index 359324b2046..fcb92495d97 100644 --- a/sections/image-with-text.liquid +++ b/sections/image-with-text.liquid @@ -15,87 +15,93 @@ {%- endstyle -%} {%- liquid - assign scheme1 = settings.color_schemes | first assign fetch_priority = 'auto' if section.index == 1 assign fetch_priority = 'high' endif + if section.settings.color_scheme == section.settings.section_color_scheme and section.settings.content_layout == 'no-overlap' + assign remove_color_classes = true + endif -%} -
-
-
-
- {%- if section.settings.image != blank -%} - {%- if section.settings.image_behavior == 'ambient' or section.settings.image_behavior == 'zoom-in' -%} - {%- assign widths = '198, 432, 642, 900, 1284, 1800' -%} - {%- capture sizes -%} +
+
+
+
+
+
+ {%- if section.settings.image != blank -%} + {%- if section.settings.image_behavior == 'ambient' or section.settings.image_behavior == 'zoom-in' -%} + {%- assign widths = '198, 432, 642, 900, 1284, 1800' -%} + {%- capture sizes -%} (min-width: {{ settings.page_width }}px) {{ settings.page_width | minus: 100 | divided_by: 1.6667 }}px, (min-width: 750px) calc((100vw - 130px) / 1.667), calc((100vw - 50px) / 1.667) {%- endcapture -%} - {%- else -%} - {%- assign widths = '165, 360, 535, 750, 1070, 1500' -%} - {%- capture sizes -%} + {%- else -%} + {%- assign widths = '165, 360, 535, 750, 1070, 1500' -%} + {%- capture sizes -%} (min-width: {{ settings.page_width }}px) {{ settings.page_width | minus: 100 | divided_by: 2 }}px, (min-width: 750px) calc((100vw - 130px) / 2), calc((100vw - 50px) / 2) {%- endcapture -%} - {%- endif -%} - {{ - section.settings.image - | image_url: width: 1500 - | image_tag: sizes: sizes, widths: widths, fetchpriority: fetch_priority - }} - {%- else -%} - {{ 'detailed-apparel-1' | placeholder_svg_tag: 'placeholder-svg' }} - {%- endif -%} -
-
-
-
- {%- for block in section.blocks -%} - {% case block.type %} - {%- when 'heading' -%} -

- {{ block.settings.heading }} -

- {%- when 'caption' -%} -

- {{ block.settings.caption | escape }} -

- {%- when 'text' -%} -
- {{ block.settings.text }} -
- {%- when 'button' -%} - {%- if block.settings.button_label != blank -%} - - {{ block.settings.button_label | escape }} - {%- endif -%} - {%- endcase -%} - {%- endfor -%} + {{ + section.settings.image + | image_url: width: 1500 + | image_tag: sizes: sizes, widths: widths, fetchpriority: fetch_priority + }} + {%- else -%} + {{ 'detailed-apparel-1' | placeholder_svg_tag: 'placeholder-svg' }} + {%- endif -%} +
+
+
+
+ {%- for block in section.blocks -%} + {% case block.type %} + {%- when 'heading' -%} +

+ {{ block.settings.heading }} +

+ {%- when 'caption' -%} +

+ {{ block.settings.caption | escape }} +

+ {%- when 'text' -%} +
+ {{ block.settings.text }} +
+ {%- when 'button' -%} + {%- if block.settings.button_label != blank -%} + + {{ block.settings.button_label | escape }} + + {%- endif -%} + {%- endcase -%} + {%- endfor -%} +
+
@@ -234,10 +240,16 @@ }, { "type": "color_scheme", - "id": "color_scheme", + "id": "section_color_scheme", "label": "t:sections.all.colors.label", "default": "background-1" }, + { + "type": "color_scheme", + "id": "color_scheme", + "label": "t:sections.multirow.settings.container_color_scheme.label", + "default": "background-1" + }, { "type": "header", "content": "t:sections.all.animation.content" diff --git a/sections/multirow.liquid b/sections/multirow.liquid index e600f974e85..d49ed6f8a70 100644 --- a/sections/multirow.liquid +++ b/sections/multirow.liquid @@ -73,7 +73,7 @@
-
+
{%- if block.settings.caption -%}

{{ block.settings.caption | escape }}