Skip to content

Commit 0f650da

Browse files
Rachel RoppoloRachel Roppolo
authored andcommitted
UIDS-54 Initial commit of typography story
1 parent 64e3c09 commit 0f650da

File tree

12 files changed

+684
-20
lines changed

12 files changed

+684
-20
lines changed

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
{
1313
"files": [
1414
"src/**/*.{js,jsx}",
15-
"spec/**/*.{js,jsx}"
15+
"spec/**/*.{js,jsx}",
16+
"stories/**/*.{js,jsx}"
1617
],
1718
"env": {
1819
"browser": true

scss/global.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
@import url('https://fonts.googleapis.com/css?family=Lato:300,300italic,400,700:latin');
22
@import './theme';
3-
4-
body {
5-
font-family: $font-family;
6-
font-size: $font-size-base;
7-
}

scss/typography.scss

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import './colors/palette';
2+
13
$font-family: Lato, Arial, sans-serif;
24
$font-weight-light: 200;
35
$font-weight-normal: 300;
@@ -7,30 +9,69 @@ $headings-font-weight: 400;
79
$headings-font-weight-bold: 700;
810

911
@mixin font-type-100() {
10-
font-family: $font-family;
1112
font-size: .75rem;
1213
font-weight: $font-weight-normal;
1314
line-height: 1rem;
1415
}
1516

1617
@mixin font-type-200() {
17-
font-family: $font-family;
1818
font-size: $font-size-base;
1919
font-weight: $font-weight-normal;
2020
line-height: 1.25rem;
2121
}
2222

2323
@mixin font-type-300() {
24-
font-family: $font-family;
2524
// font-size: $font-size-base; -- should base be changed to 1 rem?
2625
font-size: 1rem;
2726
font-weight: $font-weight-normal;
2827
line-height: 1.5rem;
2928
}
3029

3130
@mixin font-type-400() {
32-
font-family: $font-family;
3331
font-size: 1.125rem;
34-
font-weight: $font-weight-bold;
32+
font-weight: $font-weight-normal;
33+
line-height: 1.75rem;
34+
}
35+
36+
@mixin font-type-500() {
37+
font-size: 1.25rem;
38+
font-weight: $font-weight-normal;
39+
line-height: 1.75rem;
40+
}
41+
42+
@mixin font-type-600() {
43+
font-size: 1.5rem;
44+
font-weight: $font-weight-normal;
3545
line-height: 1.75rem;
3646
}
47+
48+
@mixin font-type-200--bold() {
49+
@include font-type-200;
50+
font-weight: $font-weight-bold;
51+
}
52+
53+
@mixin font-type-300--bold() {
54+
@include font-type-300;
55+
font-weight: $font-weight-bold;
56+
}
57+
58+
@mixin font-type-400--bold() {
59+
@include font-type-400;
60+
font-weight: $font-weight-bold;
61+
}
62+
63+
@mixin font-type-500--bold() {
64+
@include font-type-500;
65+
font-weight: $headings-font-weight;
66+
}
67+
68+
@mixin font-type-600--bold() {
69+
@include font-type-600;
70+
font-weight: $headings-font-weight;
71+
}
72+
73+
body {
74+
font-family: $font-family;
75+
font-size: $font-size-base;
76+
color: $ux-gray-900;
77+
}

0 commit comments

Comments
 (0)