Skip to content

Commit 6b9a6b5

Browse files
committed
Update typography mixin and font variables. Update font styling on Member component
1 parent f143c5e commit 6b9a6b5

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

components/containers/Member/Member.module.scss

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@use '@/styles/index' as *;
2+
@use '@/styles/typography' as *;
3+
@use '@/styles/variables' as *;
24

35
.card {
46
margin: 1rem 1rem 0 0.5rem;
@@ -24,20 +26,15 @@
2426
}
2527

2628
.name {
27-
font-style: italic;
28-
font-family: $heading-font;
29-
font-size: 1.5rem;
29+
@include typography-title;
3030
color: var(--color-primary-content);
3131
margin-bottom: 0px;
32-
line-height: unset;
3332
}
3433

3534
%headingStyle {
36-
font-family: $heading-font;
37-
font-size: 1rem;
35+
@include typography-subtitle;
3836
color: var(--color-primary-content);
3937
text-align: left;
40-
line-height: normal;
4138
margin: 0px;
4239
}
4340

styles/_typography.scss

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@
1515
line-height: $line-height-md;
1616
}
1717

18+
@mixin typography-title {
19+
font-family: $font-family-secondary;
20+
font-size: $font-size-sm;
21+
font-weight: $font-weight-bold;
22+
font-style: italic;
23+
line-height: normal;
24+
}
25+
26+
@mixin typography-subtitle {
27+
font-family: $font-family-secondary;
28+
font-size: $font-size-2xs;
29+
font-weight: $font-weight-bold;
30+
line-height: normal;
31+
}
32+
1833
@mixin typography-copy {
1934
font-family: $font-family-secondary;
2035
font-size: $font-size-sm;

styles/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ $font-family-primary: 'Assistant', sans-serif;
1616
$font-family-secondary: 'Open Sans', sans-serif;
1717

1818
// Font Size
19+
$font-size-2xs: 1rem; // 16px
1920
$font-size-xs: 1.25rem; // 20px
2021
$font-size-sm: 1.5rem; // 24px
2122
$font-size-md: 2.25rem; // 36px

0 commit comments

Comments
 (0)