forked from Shopify/dawn
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'shopify/main'
* shopify/main: (86 commits) Remove setting for variant styling (Shopify#2025) Update 1 translation file (Shopify#2023) Move product media gallery and modal into snippets [Refactor] (Shopify#1934) Add variant picker sold out UI [temporary solution] (Shopify#1407) Add shopify attributes to description block on product page (Shopify#2005) [Product page] "Icon with text" block (Shopify#1933) Fetch the header (LCP) image at high priority (Shopify#1918) Enable language/country selector by default (Shopify#1988) Add version bump and release notes (Shopify#1997) [Complementary block] update url from the info text to the latest (Shopify#1974) Ensure complementary block loads card css (Shopify#1991) Variant media modal fix (Shopify#1985) fix closing element (Shopify#1981) fix slider controls showing in certain scenarios on mobile (Shopify#1973) Update 1 translation file (Shopify#1967) fix margin-top on middle center header option (Shopify#1970) Update version and release notes (Shopify#1966) [Complementary product] Keep text alignment to the left for horizontal cards (Shopify#1965) Remove Product Subtitle block from Featured Product section (Shopify#1964) Fix shadow being cut on featured collection slider, featured blog slider and collection list slider (Shopify#1961) ...
- Loading branch information
Showing
95 changed files
with
6,067 additions
and
1,307 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| .complementary-products__container { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 1.3rem; | ||
| } | ||
|
|
||
| product-recommendations:not(.is-accordion) .complementary-products__container { | ||
| margin-top: 1.5rem; | ||
| } | ||
|
|
||
| .complementary-products__container > details[open] { | ||
| padding-bottom: 1.5rem; | ||
| } | ||
|
|
||
| .complementary-slider { | ||
| margin-top: 0; | ||
| gap: 0; | ||
| } | ||
|
|
||
| .complementary-slide { | ||
| --shadow-padding-sides: calc((var(--shadow-horizontal-offset) + var(--shadow-blur-radius)) * var(--shadow-visible)); | ||
| --shadow-padding-sides-negative: calc((var(--shadow-horizontal-offset) * -1 + var(--shadow-blur-radius)) * var(--shadow-visible)); | ||
| } | ||
|
|
||
| .complementary-slide > ul { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: var(--grid-mobile-vertical-spacing); | ||
| } | ||
|
|
||
| .complementary-slide.complementary-slide--standard > ul { | ||
| gap: calc(var(--grid-mobile-vertical-spacing) + 8px); | ||
| } | ||
|
|
||
| @media screen and (min-width: 750px) { | ||
| .complementary-slide > ul { | ||
| gap: var(--grid-desktop-vertical-spacing); | ||
| } | ||
|
|
||
| .complementary-slide.complementary-slide--standard > ul { | ||
| gap: calc(var(--grid-desktop-vertical-spacing) + 8px); | ||
| } | ||
| } | ||
|
|
||
| .complementary-slide.grid__item { | ||
| width: 100%; | ||
| padding-top: max(var(--focus-outline-padding), var(--shadow-padding-top)); | ||
| padding-bottom: max(var(--focus-outline-padding), var(--shadow-padding-bottom)); | ||
| padding-right: max(var(--focus-outline-padding), var(--shadow-padding-sides)); | ||
| padding-left: max(var(--focus-outline-padding), var(--shadow-padding-sides-negative)); | ||
| } | ||
|
|
||
| .complementary-slide .card-wrapper { | ||
| height: auto; | ||
| } | ||
|
|
||
| .complementary-products > .summary__title { | ||
| display: flex; | ||
| line-height: 1; | ||
| padding: 1.5rem 0; | ||
| } | ||
|
|
||
| .accordion + product-recommendations .accordion, | ||
| product-recommendations.is-accordion + .accordion { | ||
| margin-top: 0; | ||
| border-top: none; | ||
| } | ||
|
|
||
| .complementary-products > .summary__title .icon-accordion { | ||
| fill: rgb(var(--color-foreground)); | ||
| height: calc(var(--font-heading-scale) * 2rem); | ||
| margin-right: calc(var(--font-heading-scale) * 1rem); | ||
| width: calc(var(--font-heading-scale) * 2rem); | ||
| } | ||
|
|
||
| .complementary-products__container .card--card .card__content, | ||
| .complementary-products__container .card--horizontal .card__information { | ||
| padding: 0; | ||
| } | ||
|
|
||
| .complementary-products__container .card__heading { | ||
| font-size: calc(var(--font-heading-scale) * 1.2rem); | ||
| } | ||
|
|
||
| @media only screen and (min-width: 750px) { | ||
| .complementary-products__container .card__heading { | ||
| font-size: calc(var(--font-heading-scale) * 1.3rem); | ||
| } | ||
| } | ||
|
|
||
| .complementary-products__container .card--horizontal .card__inner { | ||
| max-width: 20%; | ||
| } | ||
|
|
||
| @media screen and (min-width: 750px) and (max-width: 1200px){ | ||
| .complementary-products__container .card--horizontal .card__inner { | ||
| max-width: 25% | ||
| } | ||
| } | ||
|
|
||
| .complementary-slide .card--text .card__content { | ||
| grid-template-rows: minmax(0,1fr) max-content auto; | ||
| } | ||
|
|
||
|
|
||
| .complementary-products__container .card--card.card--media > .card__content { | ||
| margin-top: 0; | ||
| } | ||
|
|
||
| .complementary-products__container .card--card .card__inner .card__media { | ||
| border-radius: calc(var(--corner-radius) - var(--border-width) - var(--image-padding)); | ||
| } | ||
|
|
||
| .complementary-products__container .card--horizontal .quick-add { | ||
| margin: 1rem 0 0; | ||
| max-width: 20rem; | ||
| } | ||
|
|
||
| .complementary-products__container .quick-add__submit { | ||
| padding: 0.8rem 2rem; | ||
| } | ||
|
|
||
| .complementary-products__container .card--horizontal .quick-add, | ||
| .complementary-products__container .card__badge { | ||
| justify-self: var(--text-alignment); | ||
| } | ||
|
|
||
| .product--no-media .complementary-products__container .price { | ||
| text-align: var(--text-alignment); | ||
| } | ||
|
|
||
| @media screen and (min-width: 750px) { | ||
| .complementary-products__container .price--on-sale .price-item--regular { | ||
| font-size: 1.3rem; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| } | ||
|
|
||
| .price .price-item { | ||
| display: inline-block; | ||
| margin: 0 1rem 0 0; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.