Skip to content

Commit

Permalink
Fix collage section product and collection card image size (#1014)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
9 people authored Dec 20, 2021
1 parent 6f38ddd commit 226d65b
Show file tree
Hide file tree
Showing 7 changed files with 296 additions and 582 deletions.
Loading

0 comments on commit 226d65b

Please sign in to comment.