Skip to content

Commit a35ec95

Browse files
feat: dsw-3748-typespacing integration (#407)
Co-authored-by: Ashley Watson-Nolan <nolly00@gmail.com>
1 parent ba14aca commit a35ec95

File tree

11 files changed

+100
-0
lines changed

11 files changed

+100
-0
lines changed

nextjs-app-v14/src/app/integrations/typography-classes/typography-classes.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ export default function TypographyClasses() {
3131
<a href="#" className="u-font-body-l-link">This is a link within the body text.</a>
3232
</p>
3333

34+
<p className="u-font-body-l u-typographySpacing">This is a main paragraph of body text (L) with opt-in paragraph spacing.
35+
<a href="#" className="u-font-body-l-link u-typographySpacing">This is a link within the body text with opt-in spacing.</a>
36+
</p>
37+
3438
<p className="u-font-body-s">This is a smaller paragraph of body text (S). Used for secondary content or compact information.
3539
<a href="#" className="u-font-body-s-link">This is a small link in the secondary body text.</a>
3640
</p>
@@ -57,6 +61,10 @@ export default function TypographyClasses() {
5761
<a href="#" className="u-font-caption-link">Caption link example.</a>
5862
</p>
5963

64+
<p className="u-font-caption u-typographySpacing">This is a standard caption with opt-in paragraph spacing.
65+
<a href="#" className="u-font-caption-link u-typographySpacing">Caption link example with opt-in spacing.</a>
66+
</p>
67+
6068
<p className="u-font-caption-strong">This is a strong caption, useful for crucial metadata or brief labels.
6169
<a href="#" className="u-font-caption-strong-link">Strong caption link.</a>
6270
</p>

nextjs-app-v14/src/app/integrations/typography-mixins/typography-mixins.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ export default function TypographyDemo() {
3232
<a href="#" className="test-font-body-l-link">This is a link within the body text.</a>
3333
</p>
3434

35+
<p className="test-font-body-l test-font-spacing-body-l">This is a main paragraph of body text (L) with typography-spacing mixin applied.
36+
<a href="#" className="test-font-body-l-link">This is a link within the body text.</a>
37+
</p>
38+
3539
<p className="test-font-body-s">This is a smaller paragraph of body text (S). Used for secondary content or compact information.
3640
<a href="#" className="test-font-body-s-link">This is a small link in the secondary body text.</a>
3741
</p>
@@ -58,6 +62,10 @@ export default function TypographyDemo() {
5862
<a href="#" className="test-font-caption-link">Caption link example.</a>
5963
</p>
6064

65+
<p className="test-font-caption test-font-spacing-caption">This is a standard caption with typography-spacing mixin applied.
66+
<a href="#" className="test-font-caption-link">Caption link example.</a>
67+
</p>
68+
6169
<p className="test-font-caption-strong">This is a strong caption, useful for crucial metadata or brief labels.
6270
<a href="#" className="test-font-caption-strong-link">Strong caption link.</a>
6371
</p>

nextjs-app-v14/src/styles/typography-mixins.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,12 @@
102102
.test-font-caption-strong-link {
103103
@include font-theme('font-caption-strong-link');
104104
}
105+
106+
// Typography spacing classes
107+
.test-font-spacing-body-l {
108+
@include typography-spacing('font-body-l');
109+
}
110+
111+
.test-font-spacing-caption {
112+
@include typography-spacing('font-caption');
113+
}

nextjs-app-v15/src/app/integrations/typography-classes/typography-classes.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ export default function TypographyDemo() {
3131
<a href="#" className="u-font-body-l-link">This is a link within the body text.</a>
3232
</p>
3333

34+
<p className="u-font-body-l u-typographySpacing">This is a main paragraph of body text (L) with opt-in paragraph spacing.
35+
<a href="#" className="u-font-body-l-link u-typographySpacing">This is a link within the body text with opt-in spacing.</a>
36+
</p>
37+
3438
<p className="u-font-body-s">This is a smaller paragraph of body text (S). Used for secondary content or compact information.
3539
<a href="#" className="u-font-body-s-link">This is a small link in the secondary body text.</a>
3640
</p>
@@ -57,6 +61,10 @@ export default function TypographyDemo() {
5761
<a href="#" className="u-font-caption-link">Caption link example.</a>
5862
</p>
5963

64+
<p className="u-font-caption u-typographySpacing">This is a standard caption with opt-in paragraph spacing.
65+
<a href="#" className="u-font-caption-link u-typographySpacing">Caption link example with opt-in spacing.</a>
66+
</p>
67+
6068
<p className="u-font-caption-strong">This is a strong caption, useful for crucial metadata or brief labels.
6169
<a href="#" className="u-font-caption-strong-link">Strong caption link.</a>
6270
</p>

nextjs-app-v15/src/app/integrations/typography-mixins/typography-mixins.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ export default function TypographyDemo() {
3232
<a href="#" className="test-font-body-l-link">This is a link within the body text.</a>
3333
</p>
3434

35+
<p className="test-font-body-l test-font-spacing-body-l">This is a main paragraph of body text (L) with typography-spacing mixin applied.
36+
<a href="#" className="test-font-body-l-link">This is a link within the body text.</a>
37+
</p>
38+
3539
<p className="test-font-body-s">This is a smaller paragraph of body text (S). Used for secondary content or compact information.
3640
<a href="#" className="test-font-body-s-link">This is a small link in the secondary body text.</a>
3741
</p>
@@ -58,6 +62,10 @@ export default function TypographyDemo() {
5862
<a href="#" className="test-font-caption-link">Caption link example.</a>
5963
</p>
6064

65+
<p className="test-font-caption test-font-spacing-caption">This is a standard caption with typography-spacing mixin applied.
66+
<a href="#" className="test-font-caption-link">Caption link example.</a>
67+
</p>
68+
6169
<p className="test-font-caption-strong">This is a strong caption, useful for crucial metadata or brief labels.
6270
<a href="#" className="test-font-caption-strong-link">Strong caption link.</a>
6371
</p>

nextjs-app-v15/src/styles/typography-mixins.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,12 @@
102102
.test-font-caption-strong-link {
103103
@include font-theme('font-caption-strong-link');
104104
}
105+
106+
// Typography spacing classes
107+
.test-font-spacing-body-l {
108+
@include typography-spacing('font-body-l');
109+
}
110+
111+
.test-font-spacing-caption {
112+
@include typography-spacing('font-caption');
113+
}

nuxt-app/pages/integrations/typography-classes.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<a href="#" class="u-font-body-l-link">This is a link within the body text.</a>
2727
</p>
2828

29+
<p class="u-font-body-l u-typographySpacing">This is a main paragraph of body text (L) with opt-in paragraph spacing.
30+
<a href="#" class="u-font-body-l-link u-typographySpacing">This is a link within the body text with opt-in spacing.</a>
31+
</p>
32+
2933
<p class="u-font-body-s">This is a smaller paragraph of body text (S). Used for secondary content or compact information.
3034
<a href="#" class="u-font-body-s-link">This is a small link in the secondary body text.</a>
3135
</p>
@@ -52,6 +56,10 @@
5256
<a href="#" class="u-font-caption-link">Caption link example.</a>
5357
</p>
5458

59+
<p class="u-font-caption u-typographySpacing">This is a standard caption with opt-in paragraph spacing.
60+
<a href="#" class="u-font-caption-link u-typographySpacing">Caption link example with opt-in spacing.</a>
61+
</p>
62+
5563
<p class="u-font-caption-strong">This is a strong caption, useful for crucial metadata or brief labels.
5664
<a href="#" class="u-font-caption-strong-link">Strong caption link.</a>
5765
</p>

nuxt-app/pages/integrations/typography-mixins.vue

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<a href="#" class="test-font-body-l-link">This is a link within the body text.</a>
2727
</p>
2828

29+
<p class="test-font-body-l test-font-spacing-body-l">This is a main paragraph of body text (L) with typography-spacing mixin applied.
30+
<a href="#" class="test-font-body-l-link">This is a link within the body text.</a>
31+
</p>
32+
2933
<p class="test-font-body-s">This is a smaller paragraph of body text (S). Used for secondary content or compact information.
3034
<a href="#" class="test-font-body-s-link">This is a small link in the secondary body text.</a>
3135
</p>
@@ -52,6 +56,10 @@
5256
<a href="#" class="test-font-caption-link">Caption link example.</a>
5357
</p>
5458

59+
<p class="test-font-caption test-font-spacing-caption">This is a standard caption with typography-spacing mixin applied.
60+
<a href="#" class="test-font-caption-link">Caption link example.</a>
61+
</p>
62+
5563
<p class="test-font-caption-strong">This is a strong caption, useful for crucial metadata or brief labels.
5664
<a href="#" class="test-font-caption-strong-link">Strong caption link.</a>
5765
</p>
@@ -172,4 +180,13 @@ definePageMeta({
172180
.test-font-caption-strong-link {
173181
@include font-theme('font-caption-strong-link');
174182
}
183+
184+
// Typography spacing classes
185+
.test-font-spacing-body-l {
186+
@include typography-spacing('font-body-l');
187+
}
188+
189+
.test-font-spacing-caption {
190+
@include typography-spacing('font-caption');
191+
}
175192
</style>

vanilla-app/css/typography-mixins.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,12 @@
102102
.test-font-caption-strong-link {
103103
@include font-theme('font-caption-strong-link');
104104
}
105+
106+
/* Typography spacing classes */
107+
.test-font-spacing-body-l {
108+
@include typography-spacing('font-body-l');
109+
}
110+
111+
.test-font-spacing-caption {
112+
@include typography-spacing('font-caption');
113+
}

vanilla-app/integrations/typography-classes.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ <h6 class="u-font-heading-xs-italic">Tiny Header Italic (XS)</h6>
4646
<a href="#" class="u-font-body-l-link">This is a link within the body text.</a>
4747
</p>
4848

49+
<p class="u-font-body-l u-typographySpacing">This is a main paragraph of body text (L) with opt-in paragraph spacing.
50+
<a href="#" class="u-font-body-l-link u-typographySpacing">This is a link within the body text with opt-in spacing.</a>
51+
</p>
52+
4953
<p class="u-font-body-s">This is a smaller paragraph of body text (S). Used for secondary content or compact
5054
information.
5155
<a href="#" class="u-font-body-s-link">This is a small link in the secondary body text.</a>
@@ -74,6 +78,10 @@ <h6 class="u-font-heading-xs-italic">Tiny Header Italic (XS)</h6>
7478
<a href="#" class="u-font-caption-link">Caption link example.</a>
7579
</p>
7680

81+
<p class="u-font-caption u-typographySpacing">This is a standard caption with opt-in paragraph spacing.
82+
<a href="#" class="u-font-caption-link u-typographySpacing">Caption link example with opt-in spacing.</a>
83+
</p>
84+
7785
<p class="u-font-caption-strong">This is a strong caption, useful for crucial metadata or brief
7886
labels.
7987
<a href="#" class="u-font-caption-strong-link">Strong caption link.</a>

0 commit comments

Comments
 (0)