|
1 | 1 | $font-family: Lato, Arial, sans-serif; |
2 | | -$font-weight-light: 200; |
3 | | -$font-weight-normal: 300; |
4 | | -$font-size-base: .875rem; |
| 2 | +//TODO Use font-weight variables in mixins https://github.com/user-interviews/ui-design-system/issues/57 |
| 3 | +$font-weight-light: 300; |
| 4 | +$font-weight-normal: 400; |
5 | 5 | $font-weight-bold: 700; |
6 | | -$headings-font-weight: 400; |
7 | | -$headings-font-weight-bold: 700; |
| 6 | +$font-size-base: 0.875rem; |
8 | 7 |
|
9 | | -@mixin font-type-100() { |
10 | | - font-family: $font-family; |
| 8 | +@mixin font-type-10() { |
| 9 | + font-size: .625rem; |
| 10 | + font-weight: 400; |
| 11 | + letter-spacing: 0.0625rem; |
| 12 | + line-height: 0.875rem; |
| 13 | + text-transform: uppercase; |
| 14 | +} |
| 15 | + |
| 16 | +@mixin font-type-20() { |
11 | 17 | font-size: .75rem; |
12 | | - font-weight: $font-weight-normal; |
| 18 | + font-weight: 400; |
13 | 19 | line-height: 1rem; |
14 | 20 | } |
15 | 21 |
|
16 | | -@mixin font-type-200() { |
17 | | - font-family: $font-family; |
18 | | - font-size: $font-size-base; |
19 | | - font-weight: $font-weight-normal; |
| 22 | +@mixin font-type-30() { |
| 23 | + font-size: 0.875rem; |
| 24 | + font-weight: 400; |
20 | 25 | line-height: 1.25rem; |
21 | 26 | } |
22 | 27 |
|
23 | | -@mixin font-type-300() { |
24 | | - font-family: $font-family; |
| 28 | +@mixin font-type-40() { |
25 | 29 | // font-size: $font-size-base; -- should base be changed to 1 rem? |
26 | 30 | font-size: 1rem; |
27 | | - font-weight: $font-weight-normal; |
28 | | - line-height: 1.5rem; |
| 31 | + font-weight: 400; |
| 32 | + line-height: 1.375rem; |
29 | 33 | } |
30 | 34 |
|
31 | | -@mixin font-type-400() { |
32 | | - font-family: $font-family; |
| 35 | +@mixin font-type-50() { |
33 | 36 | font-size: 1.125rem; |
| 37 | + font-weight: 400; |
| 38 | + line-height: 1.5rem; |
| 39 | +} |
| 40 | + |
| 41 | +@mixin font-type-60() { |
| 42 | + font-size: 1.25rem; |
| 43 | + font-weight: 400; |
| 44 | + line-height: 1.625rem; |
| 45 | +} |
| 46 | + |
| 47 | +@mixin font-type-70() { |
| 48 | + font-size: 1.5rem; |
| 49 | + font-weight: 400; |
| 50 | + line-height: 2rem; |
| 51 | +} |
| 52 | + |
| 53 | +@mixin font-type-10--bold() { |
| 54 | + @include font-type-10; |
| 55 | + font-weight: $font-weight-bold; |
| 56 | +} |
| 57 | + |
| 58 | +@mixin font-type-10--light() { |
| 59 | + @include font-type-10; |
| 60 | + font-weight: 300; |
| 61 | +} |
| 62 | + |
| 63 | +@mixin font-type-20--bold() { |
| 64 | + @include font-type-20; |
| 65 | + font-weight: $font-weight-bold; |
| 66 | +} |
| 67 | + |
| 68 | +@mixin font-type-20--light() { |
| 69 | + @include font-type-20; |
| 70 | + font-weight: 300; |
| 71 | +} |
| 72 | + |
| 73 | +@mixin font-type-30--bold() { |
| 74 | + @include font-type-30; |
| 75 | + font-weight: $font-weight-bold; |
| 76 | +} |
| 77 | + |
| 78 | +@mixin font-type-30--light() { |
| 79 | + @include font-type-30; |
| 80 | + font-weight: 300; |
| 81 | +} |
| 82 | + |
| 83 | +@mixin font-type-40--bold() { |
| 84 | + @include font-type-40; |
34 | 85 | font-weight: $font-weight-bold; |
35 | | - line-height: 1.75rem; |
| 86 | +} |
| 87 | + |
| 88 | +@mixin font-type-40--light() { |
| 89 | + @include font-type-40; |
| 90 | + font-weight: 300; |
| 91 | +} |
| 92 | + |
| 93 | +@mixin font-type-50--bold() { |
| 94 | + @include font-type-50; |
| 95 | + font-weight: $font-weight-bold; |
| 96 | +} |
| 97 | + |
| 98 | +@mixin font-type-50--light() { |
| 99 | + @include font-type-50; |
| 100 | + font-weight: 300; |
| 101 | +} |
| 102 | + |
| 103 | +@mixin font-type-60--bold() { |
| 104 | + @include font-type-60; |
| 105 | + font-weight: $font-weight-bold; |
| 106 | +} |
| 107 | + |
| 108 | +@mixin font-type-60--light() { |
| 109 | + @include font-type-60; |
| 110 | + font-weight: 300; |
| 111 | +} |
| 112 | + |
| 113 | +@mixin font-type-70--bold() { |
| 114 | + @include font-type-70; |
| 115 | + font-weight: $font-weight-bold; |
| 116 | +} |
| 117 | + |
| 118 | +@mixin font-type-70--light() { |
| 119 | + @include font-type-70; |
| 120 | + font-weight: 300; |
36 | 121 | } |
0 commit comments