diff --git a/assets/component-image-with-text.css b/assets/component-image-with-text.css index db8d4bbbf16..c6026f2d47b 100644 --- a/assets/component-image-with-text.css +++ b/assets/component-image-with-text.css @@ -355,14 +355,16 @@ /* Multirow - note: remove from this stylesheet if multirow-specific styles increase signficantly + note: consider removing from this stylesheet if multirow-specific styles increase signficantly */ -.multirow .image-with-text { - margin-bottom: var(--grid-mobile-vertical-spacing) +.multirow__inner { + display: flex; + flex-direction: column; + row-gap: var(--grid-mobile-vertical-spacing); } @media screen and (min-width: 750px) { - .multirow .image-with-text { - margin-bottom: var(--grid-desktop-vertical-spacing) + .multirow__inner { + row-gap: var(--grid-desktop-vertical-spacing); } } diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json index 643fa5b1b15..38ce9522041 100644 --- a/locales/en.default.schema.json +++ b/locales/en.default.schema.json @@ -1453,7 +1453,7 @@ "label": "Zig zag from right" }, "options__3": { - "label": "Altgn left" + "label": "Align left" }, "options__4": { "label": "Align right" diff --git a/sections/multirow.liquid b/sections/multirow.liquid index bbb6e942ca3..cecd33335eb 100644 --- a/sections/multirow.liquid +++ b/sections/multirow.liquid @@ -15,37 +15,41 @@ {%- endstyle -%} {%- liquid - assign odd_class = 'image-with-text__grid--standard' - assign even_class = 'image-with-text__grid--reverse' if section.settings.image_layout contains 'right' - assign odd_class = 'image-with-text__grid--reverse' - assign even_class = 'image-with-text__grid--standard' + assign odd_class = ' image-with-text__grid--reverse' + else + assign even_class = ' image-with-text__grid--reverse' endif - assign transparent_content = false if section.settings.row_color_scheme == section.settings.section_color_scheme - assign transparent_content = true + assign no_content_background = true endif - if transparent_content and settings.text_boxes_shadow_opacity == 0 and settings.text_boxes_border_thickness == 0 or settings.text_boxes_border_opacity == 0 + if settings.text_boxes_shadow_opacity == 0 and settings.text_boxes_border_thickness == 0 or settings.text_boxes_border_opacity == 0 + assign no_content_styles = true + endif + + if no_content_background and no_content_styles and section.settings.desktop_content_alignment != 'center' assign padding_class = ' collapse-padding' endif + if settings.text_boxes_border_thickness > 0 and settings.text_boxes_border_opacity > 0 and settings.media_border_thickness > 0 and settings.media_border_opacity > 0 assign borders_class = ' collapse-borders' endif - unless transparent_content and settings.media_border_thickness > 0 and settings.text_boxes_shadow_opacity == 0 and settings.text_boxes_border_thickness == 0 or settings.text_boxes_border_opacity == 0 + + unless no_content_background and no_content_styles assign corners_class = ' collapse-corners' endunless -%}
-
+
{%- for block in section.blocks -%}
-
+
-
+
{%- if block.settings.caption -%}

{{ block.settings.caption | escape }}

{%- endif -%} {%- if block.settings.heading -%} -

- {{ block.settings.heading | escape }} +

+ {{ block.settings.heading }}

{%- endif -%} {%- if block.settings.text -%} @@ -393,7 +394,7 @@ "label": "t:sections.multirow.blocks.row.settings.caption.label" }, { - "type": "text", + "type": "inline_richtext", "id": "heading", "default": "Row", "label": "t:sections.multirow.blocks.row.settings.heading.label"