Skip to content

Commit ced0e9e

Browse files
authored
fix(opentrons-ai-client): fix global style unexpected overwrite issue (#18906)
* fix(opentrons-ai-client): fix global style unexpected overwrite issue
1 parent 1cb77b3 commit ced0e9e

File tree

2 files changed

+23
-10
lines changed

2 files changed

+23
-10
lines changed

components/src/styles/global.module.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,4 @@
176176
--purple-35: var(--purple-35-touchscreen);
177177
--purple-30: var(--purple-30-touchscreen);
178178
--purple-20: var(--purple-20-touchscreen);
179-
180-
/* font-family */
181-
--font-family-main: 'Public Sans';
182179
}

opentrons-ai-client/src/global.css

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
1-
/* from createGlobalStyle */
2-
* {
3-
box-sizing: border-box;
4-
margin: 0;
5-
padding: 0;
6-
font-family: var(--font-family-main), 'DejaVu Sans', sans-serif;
1+
@import url('@fontsource/public-sans');
2+
@import url('@fontsource/public-sans/600.css');
3+
@import url('@fontsource/public-sans/700.css');
4+
5+
:root {
6+
--font-family-main: 'Public Sans', 'DejaVu Sans', sans-serif;
77
}
88

9-
html,
109
body {
1110
width: 100%;
1211
height: 100%;
12+
font-family: var(--font-family-main);
1313
color: var(--black-90);
14+
-webkit-font-smoothing: antialiased;
15+
-moz-osx-font-smoothing: grayscale;
16+
}
17+
18+
*,
19+
*::before,
20+
*::after {
21+
box-sizing: border-box;
22+
margin: 0;
23+
padding: 0;
24+
}
25+
26+
button,
27+
input,
28+
textarea {
29+
font-family: inherit;
1430
}
1531

1632
a {

0 commit comments

Comments
 (0)