|
10 | 10 | // # GEL TYPOGRAPHY - TOOL |
11 | 11 | //\*------------------------------------*/ |
12 | 12 |
|
13 | | -// define some output control variables |
14 | | -$core: true !default; |
15 | | -$enhanced: true !default; |
16 | | -$fixed: false !default; |
17 | | - |
18 | 13 | // If larger font sizes enable, merge them with gel-type-settings |
19 | 14 | @if settings.$gel-type-enable--larger-type-sizes { |
20 | 15 | settings.$gel-type-settings: map.merge(settings.$gel-type-settings, settings.$gel-larger-font-sizes); |
@@ -111,29 +106,25 @@ $fixed: false !default; |
111 | 106 | // @author Adam Bulmer |
112 | 107 | // |
113 | 108 | @mixin gel-typography($type-class) { |
114 | | - @if $core { |
115 | | - $groupA: gel-typography($type-class, 'group-a'); |
116 | | - @include _gel-output-type-values($groupA); |
117 | | - @include reith-letter-spacing($groupA); |
| 109 | + $groupA: gel-typography($type-class, 'group-a'); |
| 110 | + @include _gel-output-type-values($groupA); |
| 111 | + @include reith-letter-spacing($groupA); |
| 112 | + |
| 113 | + @include mq.mq($from: gel-bp-type-b) { |
| 114 | + $groupB: gel-typography($type-class, 'group-b'); |
| 115 | + @include _gel-output-type-values($groupB); |
| 116 | + @include reith-letter-spacing($groupB); |
118 | 117 | } |
119 | 118 |
|
120 | | - @if $enhanced { |
121 | | - @include mq.mq($from: gel-bp-type-b) { |
122 | | - $groupB: gel-typography($type-class, 'group-b'); |
123 | | - @include _gel-output-type-values($groupB); |
124 | | - @include reith-letter-spacing($groupB); |
125 | | - } |
126 | | - |
127 | | - @include mq.mq($from: gel-bp-type-c) { |
128 | | - $groupC: gel-typography($type-class, 'group-c'); |
129 | | - @include _gel-output-type-values($groupC); |
130 | | - @include reith-letter-spacing($groupC); |
| 119 | + @include mq.mq($from: gel-bp-type-c) { |
| 120 | + $groupC: gel-typography($type-class, 'group-c'); |
| 121 | + @include _gel-output-type-values($groupC); |
| 122 | + @include reith-letter-spacing($groupC); |
131 | 123 |
|
132 | | - .#{settings.$gel-type-touch-class} & { |
133 | | - $groupNoTouch: gel-typography($type-class, settings.$gel-type-no-touch-group); |
134 | | - @include _gel-output-type-values($groupNoTouch); |
135 | | - @include reith-letter-spacing($groupNoTouch); |
136 | | - } |
| 124 | + .#{settings.$gel-type-touch-class} & { |
| 125 | + $groupNoTouch: gel-typography($type-class, settings.$gel-type-no-touch-group); |
| 126 | + @include _gel-output-type-values($groupNoTouch); |
| 127 | + @include reith-letter-spacing($groupNoTouch); |
137 | 128 | } |
138 | 129 | } |
139 | 130 | } |
|
0 commit comments