Skip to content

Commit 0cada68

Browse files
committed
chore(style): remove lime-typography.scss
And also remove the no-op `@use '@material/typography'`. We didn't really have any use for this file, except in one location. We handle typographic styles individually in components.
1 parent 0431b98 commit 0cada68

File tree

34 files changed

+66
-136
lines changed

34 files changed

+66
-136
lines changed

src/components/action-bar/action-bar-item/action-bar-item.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ button {
4040
color: var(--limel-action-bar-item-text-color);
4141

4242
border-radius: var(--action-bar-item-height);
43-
font-size: functions.pxToRem(14);
43+
font-size: var(--limel-theme-default-font-size);
4444
padding: 0 0.25rem;
4545

4646
&:has(.text) {

src/components/breadcrumbs/breadcrumbs.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ol {
4848

4949
color: var(--limel-breadcrumbs-item-text-color);
5050
border-radius: 100vw;
51-
font-size: 0.875rem;
51+
font-size: var(--limel-theme-default-font-size);
5252
padding: 0 0.25rem;
5353

5454
&:not(:has(.text)) {

src/components/button-group/button-group.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
display: inline-grid;
2727
grid-auto-flow: column;
2828
margin: functions.pxToRem(2) !important;
29-
font-size: functions.pxToRem(14);
29+
font-size: var(--limel-theme-default-font-size);
3030

3131
&:not(:last-child) {
3232
&:after {

src/components/button/button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ button {
8080
}
8181

8282
.label {
83-
font-size: 0.875rem;
83+
font-size: var(--limel-theme-default-font-size);
8484
font-weight: 600;
8585
letter-spacing: functions.pxToRem(0.5);
8686
padding: 0 0.25rem;

src/components/card/card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ header {
124124
}
125125

126126
h2 {
127-
font-size: 0.875rem;
127+
font-size: var(--limel-theme-default-font-size);
128128
font-weight: 400;
129129
color: var(--card-subheading-color, rgb(var(--contrast-1000)));
130130
}

src/components/checkbox/checkbox.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ limel-dynamic-label {
3939
// other font-related styles that might be set by MDC,
4040
// such as `letter-spacing` or `font-size`.
4141
font-family: inherit;
42+
font-size: var(--limel-theme-default-font-size);
4243
}
4344

4445
.mdc-form-field {

src/components/chip/chip.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ limel-badge {
183183
@include mixins.truncate-text;
184184
line-height: 1.2;
185185
padding: 0 0.5rem;
186+
font-size: var(--limel-theme-default-font-size);
186187
}
187188

188189
.trailing-button {

src/components/dock/dock-button/dock-button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
height: var(--dock-item-height);
2222

2323
border-radius: functions.pxToRem(6);
24-
font-size: functions.pxToRem(14);
24+
font-size: var(--limel-theme-default-font-size);
2525
padding: 0 0.5rem;
2626
min-width: var(--dock-item-height);
2727

src/components/form/examples/map-component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
background-color: rgba(var(--contrast-300), 0.9);
2525
color: rgb(var(--contrast-1100));
2626

27-
font-size: 0.875rem;
27+
font-size: var(--limel-theme-default-font-size);
2828
}
2929

3030
iframe {

src/components/form/form.scss

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use '../../style/internal/lime-typography';
21
@use '../../style/internal/shared_input-select-picker';
32

43
/**
@@ -10,8 +9,6 @@
109
* @prop --form-background-color-of-odd-rows:Background of odd rows in the form, when layout type is `row`. Defaults to `--contrast-200`.
1110
*/
1211

13-
@include lime-typography.core-styles;
14-
1512
.form-group {
1613
min-width: 0;
1714
}
@@ -182,17 +179,18 @@ limel-code-editor {
182179
}
183180

184181
.mdc-typography--headline1 {
185-
--mdc-typography-headline1-font-size: 2rem;
186-
--mdc-typography-headline1-line-height: 2.25rem;
187-
--mdc-typography-headline1-letter-spacing: -0.01rem;
188-
--mdc-typography-headline1-font-weight: 400;
182+
font-size: 2rem;
183+
line-height: 2.25rem;
184+
letter-spacing: -0.01rem;
185+
font-weight: 400;
189186
margin-top: 1.5rem;
190187
margin-bottom: 0.25rem;
191188
}
192189

193190
.mdc-typography--body1 {
194191
margin-top: 0;
195192
margin-bottom: 0.5rem;
193+
font-size: var(--limel-theme-default-font-size);
196194
}
197195

198196
.form-group {
@@ -202,9 +200,9 @@ limel-code-editor {
202200
}
203201

204202
.mdc-typography--headline1 {
205-
--mdc-typography-headline1-font-size: 1.625rem;
206-
--mdc-typography-headline1-line-height: 1.25rem;
207-
--mdc-typography-headline1-font-weight: 300;
203+
font-size: 1.625rem;
204+
line-height: 1.25rem;
205+
font-weight: 300;
208206
margin-top: 1rem;
209207

210208
&:before {
@@ -221,7 +219,7 @@ limel-code-editor {
221219
var(--limel-theme-primary-color)
222220
);
223221
width: 0.125rem;
224-
height: var(--mdc-typography-headline1-line-height);
222+
height: 1.5rem;
225223
border-radius: 0.125rem;
226224

227225
opacity: 0.6;
@@ -235,8 +233,8 @@ limel-code-editor {
235233
}
236234

237235
.mdc-typography--headline1 {
238-
--mdc-typography-headline1-font-size: 1.375rem;
239-
--mdc-typography-headline1-line-height: 1.5rem;
236+
font-size: 1.375rem;
237+
line-height: 1.5rem;
240238
margin-top: 0.5rem;
241239

242240
&:before {
@@ -251,8 +249,8 @@ limel-code-editor {
251249
}
252250

253251
.mdc-typography--headline1 {
254-
--mdc-typography-headline1-font-size: 1.25rem;
255-
--mdc-typography-headline1-line-height: 1.25rem;
252+
font-size: 1.25rem;
253+
line-height: 1.25rem;
256254
margin-top: 1rem;
257255

258256
&:before {
@@ -267,8 +265,8 @@ limel-code-editor {
267265
}
268266

269267
.mdc-typography--headline1 {
270-
--mdc-typography-headline1-font-size: 1.25rem;
271-
--mdc-typography-headline1-line-height: 1.25rem;
268+
font-size: 1.25rem;
269+
line-height: 1.25rem;
272270
margin-top: 0.25rem;
273271

274272
&:before {
@@ -283,8 +281,8 @@ limel-code-editor {
283281
}
284282

285283
.mdc-typography--headline1 {
286-
--mdc-typography-headline1-font-size: 1rem;
287-
--mdc-typography-headline1-line-height: 1rem;
284+
font-size: 1rem;
285+
line-height: 1rem;
288286
margin-top: 0.25rem;
289287

290288
&:before {

0 commit comments

Comments
 (0)