-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
Fix collage section product and collection card image size #1014
Conversation
* 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
* Text boxes global settings setup
* Add section-wrapper/borders to applicable sections * Add section spacing * Remove default border thickness. * Fix collage spacing
Buttons + inputs
* 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>
* Move vert spacing and remove other section settings * Include collage
* 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 * Align naming
* 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 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>
b75d4b2
to
dcb6379
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only reviewed some of the functionality and have a few things I noted.
-
The focused image used to dictate the overall height of the section and wouldn't crop the image/media in it unless it's very small. Seems like now the height is quite tall by default, I'd say too tall in general. If we're wanting to remove that previous functionality then it would probably make sense to add a section height setting like some other sections. We could have an adapt to focused block image as well 🤷 screenshot.
This change would have an impact on how people used to use the section but I guess it would be part of a breaking change so it's not like we would update people to this version without their consent. -
A color scheme could be nice on the section level but I see Meli mentioned that it would be done after future explorations.
-
The collection block title seem a little to big when there isn't an image in comparison to the section title and product block title. I had started a PR to fix it but might as well be done in this overall rework of the section. screenshot
-
The spacing on the product card that has no image seem a little too far away from the title with the border: screenshot. Maybe the space above it could reduced to visually convey that they're related.
-
In the context of this section, should the image and video block be considered "cards" ? I just find it odd when you're tweaking the cards' border and shadow, that it impacts only some blocks. So if you want the overall look of the section to be similar you have to tweak different stuff in the theme settings. I guess with potential section overrides it would make it work more easily. screenshot
-
On mobile it looks like if you have two blocks the layout isn't what it should be: screenshot.
-
There is this situation with collage where if you remove the title of the second collage section (when you have two of them in a row), it then looks like one section. So I think in this situation we should use the
multicolumn vertical space
instead of thevertical space between sections
🤔 screenshot -
On the video block, the shadow setting doesn't not seem to be setup though the border is working: screenshot
Thanks for reviewing! I've addressed the following
Here's some more info on the other points
Correct, the desktop grid item behaviour has changed BeforeAfterAll collage blocks' images try to maintain their native aspect ratio, but will expand to fit any available vertical space. The key difference is that images cannot shrink vertically anymore. This helps maintain overall larger surface area for images in the collage. Maximizing surface area for images is important, because global settings like border, border-radius, image padding and large grid gaps can start to eat into the space for the image itself.
Correct, this would be implemented as part of block-level overrides.
The collection block now shares all markup and styles with the
Same for the product block, which now shares all markup and styles with the
Yes, separate issue was created for this
Yeah, although it could be beneficial for automatically enforcing consistent grid spacing, the decision was made to avoid "magic" behaviour. The section's internal padding settings should be leveraged to achieve the same look. |
Thank you Kai! I think I wasn't looking at the right demo link, sorry! 🙌
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks really good. I'm loving the simplification of the collage CSS. I think a lot of what we've done in the past few weeks has added some complexity to our styles in particular, but a PR like this helps to reel it in a bit. 🎉
I did some tests on various layouts and everything looked good to me. I will trust @wiktoriaswiecicka 's certainly more thorough visual tests.
…into fix-collage
…into fix-collage # Conflicts: # assets/component-card.css
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. I get now that change in logic. That we would rather crop the image from the image block or video one over a product or collection 👍
I think it has still an issue where if you're adding an image/video you will have a hard knowing what would be the right size to get the least amount of your content cropped.
Unless the styling has changed for mobile I noticed that it wasn't quite right when you have two blocks only.
grid-column: 2 / span 2; | ||
.collage--mobile .collage__item--left:nth-child(3n - 2), | ||
.collage--mobile .collage__item--left:nth-child(3n - 1):last-child { | ||
grid-column: span 2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should it span 2 when it's only two items ? Or be the two blocks on 1 row, 50% 50%.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes good point, should be 50/50 if mobile layout is collage
! Updated 44485c5
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
Why are these changes introduced?
Fixes #995
Also addresses:
#929 (comment)
#378
#699
#910
What approach did you take?
1. Prevent "squished" images
Product and collection card images:
This is a change in how the collage inherently behaves (see before and after demo stores), but will prevent narrow horizontally cropped product/collection images.
2. Extend card height
extend_height
can be passed intocard-product
andcard-collection
snippets3. Refactor - Separate collage grid layout from block content
This allows styles for collage grid layout to be decoupled from each block's contents. This simplifies the CSS structure.
Layout
.collage
.collage__item
Block content
image
.collage-card
.media
product
card-product
snippetcollection
card-collection
snippetvideo
.collage-card
.deferred-media
4. Refactor - Separate video modal into its own component
collage.css
component-modal-video.css
.collage-video__modal
.modal-video
.collage-video__modal-<element>
.modal-video__<element>
Other considerations
Simplification of collage video behaviour
Before
After
Why?
Demo links
Store
Editor
Checklist