Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add global sections settings #891

Merged
merged 6 commits into from
Nov 16, 2021

Conversation

kmeleta
Copy link
Contributor

@kmeleta kmeleta commented Nov 15, 2021

Why are these changes introduced?

Added section settings for borders and vertical spacing.

What approach did you take?

Border styles and corner radius have been tied to a section-wrapper classes which have been added where needed to each applicable section. Some area that can receive borders are best left with some amount of padding (value tbd) and I've applied this via section-wrapper--padded. Additionally, some sections have fullwidth display modes. Left and right borders and well as corner radius have been excluded in these cases.

Using this approach seemed like a good idea when there were more settings involved, but maybe now with just borders the styles can be applied directly to existing elements in each section.

Borders have been excluded from...

  • Featured collection
  • Collection list
  • Multicolumn

Vertical spacing is applied to global spaced-section type classes, but also to section specific stylesheets which override those global classes. I've also included the concept of "safe spacing" in some uses of these spacing variables to ensure some amount of spacing is used in sections where zero spacing isn't ideal. How exactly this spacing interacts with heading margins is tbd.

Other considerations

Border styles have been applied where we most likely want them. Some sections have been excluded from this until local overrides are available. UX is still considering the details of this and more sections may be included or excluded.

To better facilitate vertical spacing between sections, the methods by which each section currently manages this space should probably be completely reworked. Many sections have their own margins and paddings applied to different elements and each of these can change based on other settings specific to each section. Globally controlling all these exceptions is sure to lead to bugs and inconsistencies.

Demo links

Checklist

@kmeleta kmeleta changed the base branch from main to all-global-settings November 15, 2021 20:22
@kmeleta kmeleta marked this pull request as ready for review November 15, 2021 20:29
@tyleralsbury tyleralsbury self-requested a review November 15, 2021 21:52
Copy link
Contributor

@tyleralsbury tyleralsbury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good from testing. Will need to take a more in-depth look at the code changes; I see a lot of refactoring.

One thing to think about is if/how these settings should affect main sections for pages like the main product section or collection grid. Currently this is only affecting sections that are "sections everywhere" sections when it comes to the borders.

cc @melissaperreault

@kmeleta
Copy link
Contributor Author

kmeleta commented Nov 15, 2021

Thanks @tyleralsbury

I see a lot of refactoring.

If you mean in the liquid, it's mostly just adding a new div parent to some sections to contain the border styles. Does look kinda scary in diffs. Otherwise I'd honestly like to refactor more around the how spaced-section margins are applied and subsequently overridden by many sections.

Currently this is only affecting sections that are "sections everywhere" sections when it comes to the borders.

Much of the discussion to this point has been around the re-usable sections so the others got overlooked. I can add the others shortly (in a followup if that's best)

@tyleralsbury
Copy link
Contributor

Much of the discussion to this point has been around the re-usable sections so the others got overlooked. I can add the others shortly (in a followup if that's best)

I'm not sure what the expectation is for that, so it'd be a good idea to figure it out with @melissaperreault before we decide anything. In a follow-up for sure.

@martinamarien martinamarien mentioned this pull request Nov 16, 2021
7 tasks
@sofiamatulis sofiamatulis self-assigned this Nov 16, 2021
Copy link
Contributor

@sofiamatulis sofiamatulis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good 👍 Added a few comments

"unit": "px",
"label": "Corner radius",
"default": 0
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we arent requesting translations yet, but what do you think of already adding the content to the en file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section still has questions around it and is sure to change. I think it's best to minimize the files touched until we're closer to nailing it down.

@@ -83,14 +83,22 @@
--page-width: {{ settings.page_width | divided_by: 10 }}rem;
--page-width-margin: {% if settings.page_width == '1600' %}2{% else %}0{% endif %}rem;

--sections-spacing: {{ settings.sections_spacing }}px;
--sections-safe-spacing: {% if settings.sections_spacing < 15 %}15{% else %}{{settings.sections_spacing}}{% endif %}px;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

curious as this was named safe spacing

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a concept to prevent this issue. Some sections can bump up against each other with 0px spacing, but others (ones with headings like this) should always have some spacing (tbd). I want to take time to align how sections/headings are applying margins so this could become less necessary.

<img
srcset="{%- if block.settings.product.media[1].width >= 550 -%}{{ block.settings.product.media[1] | img_url: '550x' }} 550w,{%- endif -%}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious as to why the media for images is being changed on this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't be, I think the the diffs just look weird because I added a div that encompasses all this. You'll notice the line being compared to this is a different part of the file (line 68 vs 87).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can hide whitespace changes to make the diffs clearer, I think. It might help to solve some of these weird looking diffs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right, you can do that. Much better.

<img
srcset="{%- if block.settings.collection.featured_image.width >= 550 -%}{{ block.settings.collection.featured_image | img_url: '550x' }} 550w,{%- endif -%}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

{{ 'onboarding.collection_title' | t }}<span class="icon-wrap">&nbsp;{% render 'icon-arrow' %}</span>
</h3>
<div class="collage-content">
<div class="collage-card__no-image card-colored color-background-1 card__text-spacing center">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be part of this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should just be whitespace in the diff.

<div class="product__media-item" data-media-id="{{ section.id }}-{{ media.id }}">
{% render 'product-thumbnail', media: media, position: forloop.index, loop: section.settings.enable_video_looping, modal_id: section.id, xr_button: false %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be part of this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should just be whitespace in the diff.

{%- endif -%}
</template>
</deferred-media>
</div>
</div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should add an info here since this doesnt affect all borders. 🤔 It took me a bit to realize why it wasnt applying to all borders

cc @melissaperreault
https://screenshot.click/16-28-ak5vb-t961b.png

.section-wrapper--padded {
padding: 2rem;
}

.grid-auto-flow {
display: grid;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think well need to re-visit everywhere where we were calculating the vertical spacing like

  .background-secondary {
    padding: calc(6rem + var(--page-width-margin)) 0
      calc(5rem + var(--page-width-margin));
  }
}

in base.css

Or where we add negative margin.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't quite know what to do with the background secondary cases yet. Will need to follow up with design after merge.

--sections-border-width: {{ settings.sections_border_width }}px;
--sections-border-opacity: {{ settings.sections_border_opacity | divided_by: 100.0 }};
--sections-border-color: {{ settings.sections_border_color.red }}, {{ settings.sections_border_color.green }}, {{ settings.sections_border_color.blue }};

--popup-drawer-border-width: {{ settings.popup_drawer_border_width }}px;
--popup-drawer-border-opacity: {{ settings.popup_drawer_border_opacity | divided_by: 100.0 }};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will need to re-visit everywhere where we have negative margin

For instance in collage:

  .collage-section + .collage-section .no-heading {
    margin-top: calc(-4rem - var(--page-width-margin));
  }

this is happening: https://screenshot.click/16-36-6uzmu-j7ykj.png

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to fix the collage case so we can see that that use case better. But again the code involved here really needs to be cleaned up once the direction is settled on.

Copy link
Contributor

@sofiamatulis sofiamatulis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The negative margin and calculated margin scenarios can be addressed in a follow up 👍

For instance: collage + collage should have very little spacing
https://screenshot.click/16-29-i8qpy-1fkca.png

@kmeleta kmeleta merged commit 5614817 into all-global-settings Nov 16, 2021
@kmeleta kmeleta deleted the add-global-sections-settings branch November 16, 2021 20:32
@kmeleta kmeleta mentioned this pull request Nov 18, 2021
5 tasks
martinamarien pushed a commit that referenced this pull request Dec 16, 2021
* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing
KaichenWang added a commit that referenced this pull request Dec 20, 2021
* Add theme level grid setting (#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (#865)

* Add media settings to non-card non-textbox elements (#893)

* Text boxes global settings setup (#889)

* Text boxes global settings setup

* Add global sections settings (#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (#844)

Buttons + inputs

* Added back section settings tmeporarily (#899)

* Add global settings cards (#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (#812)

* Version bump to 2.4.0 (#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (#903)

* Clean up popup drawer feed (#902)

* Revert global section settings (#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (#912)

* Image with text section - Apply global textbox and media settings (#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Refactor collage

* Update BEM for video modal

* Adjust image spacing for mobile

* Clean up

* Set grip gap to global setting values

* Fix collage focus states

* Revert block order in liquid

* Revert block order in liquid

* Update file name

* Add special case for single product/collection card

* Remove ratios

* Remove single video case

* Update auto height setting for product and collection cards

* Move card shadow to pseudo element (#1012)

* Move product/card media shadows to pseudo element (#1013)

* Add variant pills settings (#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (#1003)

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Clean up

* Adjust implementation for card height extend

* Adjust implementation for card height extend

* Fix focus and clickable area for video which includes padding

* Address PR comment. Fix 2 item mobile collage

* Add position relative to collage-card for shadows

* Update mobile collage layout

* Use minmax to prevent grid expansion beyond viewport

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
ludoboludo pushed a commit that referenced this pull request Dec 20, 2021
* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing
KaichenWang pushed a commit that referenced this pull request Dec 22, 2021
* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing
KaichenWang added a commit that referenced this pull request Dec 22, 2021
* Add theme level grid setting (#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (#865)

* Add media settings to non-card non-textbox elements (#893)

* Text boxes global settings setup (#889)

* Text boxes global settings setup

* Add global sections settings (#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (#844)

Buttons + inputs

* Added back section settings tmeporarily (#899)

* Add global settings cards (#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (#812)

* Version bump to 2.4.0 (#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (#903)

* Clean up popup drawer feed (#902)

* Revert global section settings (#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (#912)

* Image with text section - Apply global textbox and media settings (#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Refactor collage

* Update BEM for video modal

* Adjust image spacing for mobile

* Clean up

* Set grip gap to global setting values

* Fix collage focus states

* Revert block order in liquid

* Revert block order in liquid

* Update file name

* Add special case for single product/collection card

* Remove ratios

* Remove single video case

* Update auto height setting for product and collection cards

* Move card shadow to pseudo element (#1012)

* Move product/card media shadows to pseudo element (#1013)

* Add variant pills settings (#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (#1003)

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Clean up

* Adjust implementation for card height extend

* Adjust implementation for card height extend

* Fix focus and clickable area for video which includes padding

* Address PR comment. Fix 2 item mobile collage

* Add position relative to collage-card for shadows

* Update mobile collage layout

* Use minmax to prevent grid expansion beyond viewport

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
KaichenWang added a commit that referenced this pull request Jan 5, 2022
* Add theme level grid setting (#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (#865)

* Add media settings to non-card non-textbox elements (#893)

* Text boxes global settings setup (#889)

* Text boxes global settings setup

* Add global sections settings (#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (#844)

Buttons + inputs

* Added back section settings tmeporarily (#899)

* Add global settings cards (#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (#812)

* Version bump to 2.4.0 (#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (#903)

* Clean up popup drawer feed (#902)

* Revert global section settings (#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (#912)

* Image with text section - Apply global textbox and media settings (#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Move card shadow to pseudo element (#1012)

* Move product/card media shadows to pseudo element (#1013)

* Add variant pills settings (#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (#1003) + rebase merge conflicts

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Multicolumn shadow updates (#1023)

* Apply shadow filter and background-none alternative

* Prevent border radius on background-none

* Update background class conditional

* Move shadows to pseudo element

* Whitespace

Co-authored-by: Ludo <ludo.segura@shopify.com>

Co-authored-by: Ludo <ludo.segura@shopify.com>

* fix rebase issues

* Section padding settings (#1006)

* Section paddings settings

* Blog cards update (#1036)

* Update article cards to use card structure

* Fix collage section product and collection card image size (#1014)

* Add theme level grid setting (#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (#865)

* Add media settings to non-card non-textbox elements (#893)

* Text boxes global settings setup (#889)

* Text boxes global settings setup

* Add global sections settings (#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (#844)

Buttons + inputs

* Added back section settings tmeporarily (#899)

* Add global settings cards (#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (#812)

* Version bump to 2.4.0 (#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (#903)

* Clean up popup drawer feed (#902)

* Revert global section settings (#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (#912)

* Image with text section - Apply global textbox and media settings (#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Refactor collage

* Update BEM for video modal

* Adjust image spacing for mobile

* Clean up

* Set grip gap to global setting values

* Fix collage focus states

* Revert block order in liquid

* Revert block order in liquid

* Update file name

* Add special case for single product/collection card

* Remove ratios

* Remove single video case

* Update auto height setting for product and collection cards

* Move card shadow to pseudo element (#1012)

* Move product/card media shadows to pseudo element (#1013)

* Add variant pills settings (#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (#1003)

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Clean up

* Adjust implementation for card height extend

* Adjust implementation for card height extend

* Fix focus and clickable area for video which includes padding

* Address PR comment. Fix 2 item mobile collage

* Add position relative to collage-card for shadows

* Update mobile collage layout

* Use minmax to prevent grid expansion beyond viewport

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Slider spacing fixes (#1037)

* Update the high level order of the global settings (#1029)

* update the order of high level setting

* remove style icons header

* fix my mistake

* add border radius to dynamic checkout buttons (#1024)

* Update global settings range values (#1042)

* update the order of high level setting

* update range values

* adjust buttons values

* update min value

* update range values

* adjust buttons values

* update min value

* Pill shadow updates (#1052)

* Move pill shadow to pseudo element

* Fix radius value

* Settings content naming update (#1044)

* update the naming and clean up

* adjust behavior

* re-add decorative elements

* fix code

* remove unsused translations and add pop-ups paragraph

* rebase 1

* rebase 2

* fix code

* remove s to border

* fix feedback

* Update layout range and values for mobile (#1055)

* Add content container to sections and update styling (#1050)

* Revise range values (#1069)

* testing values

* adjust buttons and blur

* Refactor button styles (#1064)

* Move button styling to pseudo elements

* Fix shadow depth in affected sections

* Add border width/opacity condition

* Fix branded checkout button heights

* Fix border radius/border width calculations

* Ignore facets

* Cart and customer button fixes

* Fix tertiary dimensions and opacity

* Fix content container shadow when set to transparent (#1075)

* New section - Collapsible content (#956)

* Update 13 translation files

Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Kai <KaichenWang@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
KaichenWang pushed a commit that referenced this pull request Jan 5, 2022
* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing
KaichenWang added a commit that referenced this pull request Jan 5, 2022
* Add theme level grid setting (#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (#865)

* Add media settings to non-card non-textbox elements (#893)

* Text boxes global settings setup (#889)

* Text boxes global settings setup

* Add global sections settings (#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (#844)

Buttons + inputs

* Added back section settings tmeporarily (#899)

* Add global settings cards (#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (#812)

* Version bump to 2.4.0 (#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (#903)

* Clean up popup drawer feed (#902)

* Revert global section settings (#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (#912)

* Image with text section - Apply global textbox and media settings (#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Refactor collage

* Update BEM for video modal

* Adjust image spacing for mobile

* Clean up

* Set grip gap to global setting values

* Fix collage focus states

* Revert block order in liquid

* Revert block order in liquid

* Update file name

* Add special case for single product/collection card

* Remove ratios

* Remove single video case

* Update auto height setting for product and collection cards

* Move card shadow to pseudo element (#1012)

* Move product/card media shadows to pseudo element (#1013)

* Add variant pills settings (#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (#1003)

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Clean up

* Adjust implementation for card height extend

* Adjust implementation for card height extend

* Fix focus and clickable area for video which includes padding

* Address PR comment. Fix 2 item mobile collage

* Add position relative to collage-card for shadows

* Update mobile collage layout

* Use minmax to prevent grid expansion beyond viewport

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
KaichenWang added a commit that referenced this pull request Jan 12, 2022
* Add theme level grid setting (#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (#865)

* Add media settings to non-card non-textbox elements (#893)

* Text boxes global settings setup (#889)

* Text boxes global settings setup

* Add global sections settings (#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (#844)

Buttons + inputs

* Added back section settings tmeporarily (#899)

* Add global settings cards (#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (#812)

* Version bump to 2.4.0 (#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (#903)

* Clean up popup drawer feed (#902)

* Revert global section settings (#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (#912)

* Image with text section - Apply global textbox and media settings (#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Move card shadow to pseudo element (#1012)

* Move product/card media shadows to pseudo element (#1013)

* Add variant pills settings (#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (#1003) + rebase merge conflicts

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Multicolumn shadow updates (#1023)

* Apply shadow filter and background-none alternative

* Prevent border radius on background-none

* Update background class conditional

* Move shadows to pseudo element

* Whitespace

Co-authored-by: Ludo <ludo.segura@shopify.com>

Co-authored-by: Ludo <ludo.segura@shopify.com>

* fix rebase issues

* Section padding settings (#1006)

* Section paddings settings

* Blog cards update (#1036)

* Update article cards to use card structure

* Fix collage section product and collection card image size (#1014)

* Add theme level grid setting (#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (#865)

* Add media settings to non-card non-textbox elements (#893)

* Text boxes global settings setup (#889)

* Text boxes global settings setup

* Add global sections settings (#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (#844)

Buttons + inputs

* Added back section settings tmeporarily (#899)

* Add global settings cards (#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (#812)

* Version bump to 2.4.0 (#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (#903)

* Clean up popup drawer feed (#902)

* Revert global section settings (#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (#912)

* Image with text section - Apply global textbox and media settings (#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Refactor collage

* Update BEM for video modal

* Adjust image spacing for mobile

* Clean up

* Set grip gap to global setting values

* Fix collage focus states

* Revert block order in liquid

* Revert block order in liquid

* Update file name

* Add special case for single product/collection card

* Remove ratios

* Remove single video case

* Update auto height setting for product and collection cards

* Move card shadow to pseudo element (#1012)

* Move product/card media shadows to pseudo element (#1013)

* Add variant pills settings (#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (#1003)

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Clean up

* Adjust implementation for card height extend

* Adjust implementation for card height extend

* Fix focus and clickable area for video which includes padding

* Address PR comment. Fix 2 item mobile collage

* Add position relative to collage-card for shadows

* Update mobile collage layout

* Use minmax to prevent grid expansion beyond viewport

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Slider spacing fixes (#1037)

* Update the high level order of the global settings (#1029)

* update the order of high level setting

* remove style icons header

* fix my mistake

* add border radius to dynamic checkout buttons (#1024)

* Update global settings range values (#1042)

* update the order of high level setting

* update range values

* adjust buttons values

* update min value

* update range values

* adjust buttons values

* update min value

* Pill shadow updates (#1052)

* Move pill shadow to pseudo element

* Fix radius value

* Settings content naming update (#1044)

* update the naming and clean up

* adjust behavior

* re-add decorative elements

* fix code

* remove unsused translations and add pop-ups paragraph

* rebase 1

* rebase 2

* fix code

* remove s to border

* fix feedback

* Update layout range and values for mobile (#1055)

* Add content container to sections and update styling (#1050)

* Revise range values (#1069)

* testing values

* adjust buttons and blur

* Refactor button styles (#1064)

* Move button styling to pseudo elements

* Fix shadow depth in affected sections

* Add border width/opacity condition

* Fix branded checkout button heights

* Fix border radius/border width calculations

* Ignore facets

* Cart and customer button fixes

* Fix tertiary dimensions and opacity

* Fix content container shadow when set to transparent (#1075)

* New section - Collapsible content (#956)

* Update 13 translation files

* Update template CSS variables for password and gift card

* Remove drawer variables from password page

* Remove popup variables from password page

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
phapsidesGT pushed a commit to Gravytrain-UK/gt-shopify-dawn-theme that referenced this pull request Sep 3, 2024
* Add theme level grid setting (Shopify#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (Shopify#865)

* Add media settings to non-card non-textbox elements (Shopify#893)

* Text boxes global settings setup (Shopify#889)

* Text boxes global settings setup

* Add global sections settings (Shopify#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (Shopify#844)

Buttons + inputs

* Added back section settings tmeporarily (Shopify#899)

* Add global settings cards (Shopify#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (Shopify#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (Shopify#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (Shopify#812)

* Version bump to 2.4.0 (Shopify#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (Shopify#903)

* Clean up popup drawer feed (Shopify#902)

* Revert global section settings (Shopify#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (Shopify#912)

* Image with text section - Apply global textbox and media settings (Shopify#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (Shopify#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (Shopify#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (Shopify#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Move card shadow to pseudo element (Shopify#1012)

* Move product/card media shadows to pseudo element (Shopify#1013)

* Add variant pills settings (Shopify#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (Shopify#1003) + rebase merge conflicts

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Multicolumn shadow updates (Shopify#1023)

* Apply shadow filter and background-none alternative

* Prevent border radius on background-none

* Update background class conditional

* Move shadows to pseudo element

* Whitespace

Co-authored-by: Ludo <ludo.segura@shopify.com>

Co-authored-by: Ludo <ludo.segura@shopify.com>

* fix rebase issues

* Section padding settings (Shopify#1006)

* Section paddings settings

* Blog cards update (Shopify#1036)

* Update article cards to use card structure

* Fix collage section product and collection card image size (Shopify#1014)

* Add theme level grid setting (Shopify#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (Shopify#865)

* Add media settings to non-card non-textbox elements (Shopify#893)

* Text boxes global settings setup (Shopify#889)

* Text boxes global settings setup

* Add global sections settings (Shopify#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (Shopify#844)

Buttons + inputs

* Added back section settings tmeporarily (Shopify#899)

* Add global settings cards (Shopify#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (Shopify#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (Shopify#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (Shopify#812)

* Version bump to 2.4.0 (Shopify#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (Shopify#903)

* Clean up popup drawer feed (Shopify#902)

* Revert global section settings (Shopify#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (Shopify#912)

* Image with text section - Apply global textbox and media settings (Shopify#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (Shopify#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (Shopify#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (Shopify#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Refactor collage

* Update BEM for video modal

* Adjust image spacing for mobile

* Clean up

* Set grip gap to global setting values

* Fix collage focus states

* Revert block order in liquid

* Revert block order in liquid

* Update file name

* Add special case for single product/collection card

* Remove ratios

* Remove single video case

* Update auto height setting for product and collection cards

* Move card shadow to pseudo element (Shopify#1012)

* Move product/card media shadows to pseudo element (Shopify#1013)

* Add variant pills settings (Shopify#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (Shopify#1003)

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Clean up

* Adjust implementation for card height extend

* Adjust implementation for card height extend

* Fix focus and clickable area for video which includes padding

* Address PR comment. Fix 2 item mobile collage

* Add position relative to collage-card for shadows

* Update mobile collage layout

* Use minmax to prevent grid expansion beyond viewport

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Slider spacing fixes (Shopify#1037)

* Update the high level order of the global settings (Shopify#1029)

* update the order of high level setting

* remove style icons header

* fix my mistake

* add border radius to dynamic checkout buttons (Shopify#1024)

* Update global settings range values (Shopify#1042)

* update the order of high level setting

* update range values

* adjust buttons values

* update min value

* update range values

* adjust buttons values

* update min value

* Pill shadow updates (Shopify#1052)

* Move pill shadow to pseudo element

* Fix radius value

* Settings content naming update (Shopify#1044)

* update the naming and clean up

* adjust behavior

* re-add decorative elements

* fix code

* remove unsused translations and add pop-ups paragraph

* rebase 1

* rebase 2

* fix code

* remove s to border

* fix feedback

* Update layout range and values for mobile (Shopify#1055)

* Add content container to sections and update styling (Shopify#1050)

* Revise range values (Shopify#1069)

* testing values

* adjust buttons and blur

* Refactor button styles (Shopify#1064)

* Move button styling to pseudo elements

* Fix shadow depth in affected sections

* Add border width/opacity condition

* Fix branded checkout button heights

* Fix border radius/border width calculations

* Ignore facets

* Cart and customer button fixes

* Fix tertiary dimensions and opacity

* Fix content container shadow when set to transparent (Shopify#1075)

* New section - Collapsible content (Shopify#956)

* Update 13 translation files

Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Kai <KaichenWang@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
phapsidesGT pushed a commit to Gravytrain-UK/gt-shopify-dawn-theme that referenced this pull request Sep 3, 2024
* Add theme level grid setting (Shopify#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (Shopify#865)

* Add media settings to non-card non-textbox elements (Shopify#893)

* Text boxes global settings setup (Shopify#889)

* Text boxes global settings setup

* Add global sections settings (Shopify#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (Shopify#844)

Buttons + inputs

* Added back section settings tmeporarily (Shopify#899)

* Add global settings cards (Shopify#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (Shopify#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (Shopify#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (Shopify#812)

* Version bump to 2.4.0 (Shopify#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (Shopify#903)

* Clean up popup drawer feed (Shopify#902)

* Revert global section settings (Shopify#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (Shopify#912)

* Image with text section - Apply global textbox and media settings (Shopify#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (Shopify#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (Shopify#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (Shopify#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Move card shadow to pseudo element (Shopify#1012)

* Move product/card media shadows to pseudo element (Shopify#1013)

* Add variant pills settings (Shopify#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (Shopify#1003) + rebase merge conflicts

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Multicolumn shadow updates (Shopify#1023)

* Apply shadow filter and background-none alternative

* Prevent border radius on background-none

* Update background class conditional

* Move shadows to pseudo element

* Whitespace

Co-authored-by: Ludo <ludo.segura@shopify.com>

Co-authored-by: Ludo <ludo.segura@shopify.com>

* fix rebase issues

* Section padding settings (Shopify#1006)

* Section paddings settings

* Blog cards update (Shopify#1036)

* Update article cards to use card structure

* Fix collage section product and collection card image size (Shopify#1014)

* Add theme level grid setting (Shopify#885)

* adjust featured blog grid

* ajust collage grid gap

* adjust featured collection grid

* update blog page grid

* add settings, css variables and update grid class

* Fix multicolumn vertical spacing

* address reviewer feedback

* Settings popup and drawer (Shopify#865)

* Add media settings to non-card non-textbox elements (Shopify#893)

* Text boxes global settings setup (Shopify#889)

* Text boxes global settings setup

* Add global sections settings (Shopify#891)

* Add section-wrapper/borders to applicable sections

* Add section spacing

* Remove default border thickness.

* Fix collage spacing

* Global settings - buttons, inputs (Shopify#844)

Buttons + inputs

* Added back section settings tmeporarily (Shopify#899)

* Add global settings cards (Shopify#886)

* Add settings to schema

* Edit template

* Add styles

* Use decimal for border-radius

* Refactor markup

* Adjust styles for product card

* Add styles

* Add settings

* Update setting and CSS variable names

* Update cards for search results

* Clean up CSS

* Update product card placeholder

* Fix visual bugs. Adjust shadow setting min

* Update markup for collection list cards

* Update hover styles

* Adjust collection arrow

* Adjust collection arrow

* Rename snippet for product card. Create snippet for collection card

* Remove separate placeholder for product card

* Adjustments for image ratio

* Add support for auto height for collage

* Clean up CSS

* Fix typo

* Fix pick up availability 'Unavailable' (Shopify#855)

* Fix pick up availability 'Unavailable'

* reuse similar check used in the same file

* Remove redundant section settings

* Update 1 translation file (Shopify#866)

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>

* Product image seo (Shopify#812)

* Version bump to 2.4.0 (Shopify#884)

* Add translation strings for en

* Adjust styles

* Update snippets/card-product.liquid

* Adjust settings organization

* Update layout/theme.liquid

Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* Remove redundant padding

* Address feedback - Clean up unused CSS

* Fix interaction with border and background

* Fix collage

* Adjust price layout

* Adjust price layout

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>

* update secondary button background color (Shopify#903)

* Clean up popup drawer feed (Shopify#902)

* Revert global section settings (Shopify#911)

* Move vert spacing and remove other section settings

* Include collage

* Remove text box padding setting (Shopify#912)

* Image with text section - Apply global textbox and media settings (Shopify#918)

* Enable textbox settings for image with text section. Clean up CSS

* Update from Shopify for theme dawn/apply-settings-image-with-text

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/apply-settings-image-with-text"

This reverts commit 7dea1d2.

* Add back bottom margin

* Remove redundant media query

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>

* Split popup and drawer settings (Shopify#917)

* Split popup and drawer settings

* Align naming

* Update global setting range values (Shopify#954)

* Update setting ranges and options for Buttons, Inputs, Layout, Media, Content containers

* Fix typo

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Reorder settings. Adjust mobile grid range and defaults

* Update settings naming

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Fix section vertical spacing (Shopify#976)

* Fix rich text margins for bg-1

* Remove section level spacing CSS

* Update and clean up spacing naming conventions

* Clean up

* Fix spacing for special consecutive sections with no heading

* Remove comment

* Update collapse grid naming

* Update behaviour of special collapsing sections

* Fix bugs

* Remove product-grip bottom margin

* Adjust setting range. Set image-with-text as collapsible section

* Update from Shopify for theme dawn/fix-section-vertical-spacing

Committed from shop: OS 2.0

* Revert "Update from Shopify for theme dawn/fix-section-vertical-spacing"

This reverts commit a0771e5.

* Adapt consistent spacing for all sections. Remove special cases

* Revert usage of section spacing for elements other than sections

* Edit settings names and order for spacing. Add mobile vertical section spacing setting

* Revert value for margin-bottom

* Revert additional padding

* Revert additional padding

* Revert heading logic

* Revert heading logic

* Revert heading logic

* Address feedback

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Update config/settings_schema.json

Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Refactor collage

* Update BEM for video modal

* Adjust image spacing for mobile

* Clean up

* Set grip gap to global setting values

* Fix collage focus states

* Revert block order in liquid

* Revert block order in liquid

* Update file name

* Add special case for single product/collection card

* Remove ratios

* Remove single video case

* Update auto height setting for product and collection cards

* Move card shadow to pseudo element (Shopify#1012)

* Move product/card media shadows to pseudo element (Shopify#1013)

* Add variant pills settings (Shopify#1005)

* Add and update settings and copy

* add css for variant pill settings

* Image with text border/corner/shadow updates (Shopify#1003)

* Collapse borders/corners and prevent shadow overlap

* Revamp approach

* Address media-only borders case

* Adjust conditional

* Prevent transparent borders from occupying physical space

* Revert border width change

* Clean up

* Adjust implementation for card height extend

* Adjust implementation for card height extend

* Fix focus and clickable area for video which includes padding

* Address PR comment. Fix 2 item mobile collage

* Add position relative to collage-card for shadows

* Update mobile collage layout

* Use minmax to prevent grid expansion beyond viewport

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>

* Slider spacing fixes (Shopify#1037)

* Update the high level order of the global settings (Shopify#1029)

* update the order of high level setting

* remove style icons header

* fix my mistake

* add border radius to dynamic checkout buttons (Shopify#1024)

* Update global settings range values (Shopify#1042)

* update the order of high level setting

* update range values

* adjust buttons values

* update min value

* update range values

* adjust buttons values

* update min value

* Pill shadow updates (Shopify#1052)

* Move pill shadow to pseudo element

* Fix radius value

* Settings content naming update (Shopify#1044)

* update the naming and clean up

* adjust behavior

* re-add decorative elements

* fix code

* remove unsused translations and add pop-ups paragraph

* rebase 1

* rebase 2

* fix code

* remove s to border

* fix feedback

* Update layout range and values for mobile (Shopify#1055)

* Add content container to sections and update styling (Shopify#1050)

* Revise range values (Shopify#1069)

* testing values

* adjust buttons and blur

* Refactor button styles (Shopify#1064)

* Move button styling to pseudo elements

* Fix shadow depth in affected sections

* Add border width/opacity condition

* Fix branded checkout button heights

* Fix border radius/border width calculations

* Ignore facets

* Cart and customer button fixes

* Fix tertiary dimensions and opacity

* Fix content container shadow when set to transparent (Shopify#1075)

* New section - Collapsible content (Shopify#956)

* Update 13 translation files

* Update template CSS variables for password and gift card

* Remove drawer variables from password page

* Remove popup variables from password page

Co-authored-by: Martina Marien <martina.marien@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: shopify-online-store[bot] <79544226+shopify-online-store[bot]@users.noreply.github.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Global settings: Sections
3 participants