diff --git a/web-components/src/global.css.js b/web-components/src/global.css.js index b4762eaf..6e53c488 100644 --- a/web-components/src/global.css.js +++ b/web-components/src/global.css.js @@ -132,6 +132,15 @@ styles.innerHTML = ` --ellipsis-icon: url('data:image/svg+xml,'); + /* callout */ + --consonant-merch-card-callout-line-height: 21px; + --consonant-merch-card-callout-font-size: 14px; + --consonant-merch-card-callout-font-color: #2C2C2C; + --consonant-merch-card-callout-icon-size: 16px; + --consonant-merch-card-callout-icon-top: 6px; + --consonant-merch-card-callout-icon-right: 8px; + --consonant-merch-card-callout-letter-spacing: 0px; + --consonant-merch-card-callout-icon-padding: 34px; } merch-card-collection { @@ -242,6 +251,43 @@ merch-card [slot='heading-xl'] { color: var(--merch-color-grey-80); } +merch-card [slot='callout-text'] { + display: inline-block; + margin: var(--consonant-merch-spacing-xxxs) 0px; +} + +merch-card [slot='callout-text'] > div { + position: relative; + display: inline-grid; + background: rgba(203 203 203 / 50%); + border-radius: var(--consonant-merch-spacing-xxxs); + padding: var(--consonant-merch-spacing-xxxs) var(--consonant-merch-spacing-xxxs) var(--consonant-merch-spacing-xxxs) var(--consonant-merch-spacing-xxs); +} + +merch-card [slot='callout-text'] > div.callout-content-wrapper-with-icon { + padding-right: var(--consonant-merch-card-callout-icon-padding); +} + +merch-card [slot='callout-text'] > div > div { + display: inline-block; + text-align: left; + font: normal normal normal var(--consonant-merch-card-callout-font-size)/var(--consonant-merch-card-callout-line-height) Adobe Clean; + letter-spacing: var(--consonant-merch-card-callout-letter-spacing); + color: var(--consonant-merch-card-callout-font-color); +} + +merch-card [slot='callout-text'] img { + position: absolute; + top: var(--consonant-merch-card-callout-icon-top); + right: var(--consonant-merch-card-callout-icon-right); + width: var(--consonant-merch-card-callout-icon-size); + height: var(--consonant-merch-card-callout-icon-size); +} + +merch-card[variant="mini-compare-chart"] [slot="callout-text"] { + padding: 0px var(--consonant-merch-spacing-s); +} + merch-card [slot='detail-m'] { font-size: var(--consonant-merch-card-detail-m-font-size); letter-spacing: var(--consonant-merch-card-detail-m-letter-spacing); diff --git a/web-components/src/merch-card.js b/web-components/src/merch-card.js index fffcc6cd..801afe37 100644 --- a/web-components/src/merch-card.js +++ b/web-components/src/merch-card.js @@ -358,6 +358,7 @@ export class MerchCard extends LitElement { +
@@ -372,7 +373,8 @@ export class MerchCard extends LitElement { - + + ${this.stockCheckbox} @@ -406,9 +408,9 @@ export class MerchCard extends LitElement { - ${!this.promoBottom ? html``: ''} + ${!this.promoBottom ? html``: ''} - ${this.promoBottom ? html``: ''} + ${this.promoBottom ? html``: ''} ${this.secureLabelFooter}`; } @@ -456,6 +458,7 @@ export class MerchCard extends LitElement { + ${this.secureLabelFooter}`; @@ -474,6 +477,7 @@ export class MerchCard extends LitElement { + ${this.miniCompareFooter} `; } diff --git a/web-components/test/img/info-icon.svg b/web-components/test/img/info-icon.svg new file mode 100644 index 00000000..12e6751b --- /dev/null +++ b/web-components/test/img/info-icon.svg @@ -0,0 +1,11 @@ + + + + + S Info 18 N + + \ No newline at end of file diff --git a/web-components/test/merch-card.mini-compare.test.html b/web-components/test/merch-card.mini-compare.test.html index 3c96ed48..3ca7915b 100644 --- a/web-components/test/merch-card.mini-compare.test.html +++ b/web-components/test/merch-card.mini-compare.test.html @@ -407,6 +407,162 @@
< +
+ + +

This is promo text with a + link

+
+

+

Get Illustrator on desktop and iPad as part of Creative Cloud.

+
+

+

Creative Cloud All Apps +

+ +
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
+

+ free + trial + Buy now +

+
+ +
+
+ + + + + +
+
+ + +

This is promo text with a + link

+
+

+

Get Illustrator on desktop and iPad as part of Creative Cloud.

+
+

+

Creative Cloud All Apps +

+ +
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
+

+ free + trial + Buy now +

+
+ +
+
+ + + + + +
+
+
Acrobat Pro
style="border: 1px solid rgb(45, 157, 120);">

merch-card aaa bbbccc dddeee bbbccc dddeee

+

Save over 25% on 20+ apps, including Photoshop, Illustrator, and more. First year only. Ends 27 here is an inline price

+
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
Save now
+ + +

Photoshop

+
+

Save over 25% on 20+ apps, including Photoshop, Illustrator, and more. First year only. Ends 27 here is an + inline price +

+

See what's + included | Learn + more

+

+
+
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
Save now
+
+ +

Acrobat

+
+

Save over 25% on 20+ apps, including Photoshop, Illustrator, and more. First year only. Ends 27 here is an + inline price +

+

See what's + included | Learn + more

+

+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
Save now
+
+ +

merch-card aaa bbbccc dddeee bbbccc dddeee

+
+

Save over 25% on 20+ apps, including Photoshop, Illustrator, and more. First year only. Ends 27 here is an + inline price +

+

See what's + included | Learn + more

+

+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
Save now
+
+ +

Photoshop

+
+

Save over 25% on 20+ apps, including Photoshop, Illustrator, and more. First year only. Ends 27 here is an + inline price +

+

This is promo text with a + link

+
+

Save over 25% on 20+ apps, including Photoshop, Illustrator, and more. First year only. Ends 27 here is an + inline price +

+

See what's + included | Learn + more

+

+
+

See what's + included | Learn + more

+

+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
Save now
+
+ +

Acrobat

+
+

Save over 25% on 20+ apps, including Photoshop, Illustrator, and more. First year only. Ends 27 here is an + inline price +

+

See what's + included | Learn + more

+

+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
Save now
+
+
+
+ + +
+

Best for:

+
    +
  • Photo editing
  • +
  • Compositing
  • +
  • Drawing and painting
  • +
  • Graphic design
  • +
+

Storage:

+

100 GB of cloud storage

+

See system requirements

+
+

Photography

+

+ +

+
+

Lightroom, Lightroom Classic, Photoshop on desktop and iPad, and 1TB of cloud storage.

+

Learn more

+
+
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
+ Free trial + Save now +
+
+ + +
+

Best for:

+
    +
  • Photo editing
  • +
  • Compositing
  • +
  • Drawing and painting
  • +
  • Graphic design
  • +
+

Storage:

+

100 GB of cloud storage

+

See system requirements

+
+

Photography

+

+ +

+
+

Lightroom, Lightroom Classic, Photoshop on desktop and iPad, and 1TB of cloud storage.

+

Learn more

+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
+ Android + IOS + Save now +
+
+ +

Creative Cloud All Apps

+

+
Desktop
+
+

+

Get 20+ creative apps including Photoshop, Illustrator, Premiere Pro, Acrobat Pro, and Adobe Express. + (Substance 3D apps are not included.)

+

See what’s included | Learn more

+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+ +

Buy now free trial

+
+
+
+ + +

Creative Cloud All Apps

+

+ +

+

Desktop

+
+

Get 20+ Creative Cloud apps including Photoshop, Illustrator, Adobe Express, Premiere Pro, and + Acrobat Pro. (Substance 3D apps are not included.)

+

+ See plans & pricing details

+
+
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
+ Save now +
+
+ + +

Photography

+

+ +

+

Desktop + Mobile

+
+

Lightroom, Lightroom Classic, Photoshop on desktop and iPad, and 1TB of cloud storage.

+

Compare photography plans

+

See plans & pricing details

+
+
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
+ Save now +
+
+ + +

Photography

+

+ +

+

Desktop + Mobile

+
+

Lightroom, Lightroom Classic, Photoshop on desktop and iPad, and 1TB of cloud storage.

+

Compare photography plans

+

See plans & pricing details

+
+
+
+
AI Assistant add-on available
+ +
+
+
+
+
+ For a limited time pay + when you add AI assistant to Acrobat Reader, Standard, or Pro. Ends 6/4.Learn More
+
+
+
+ Save now +
+
+