Skip to content

Commit 7815e01

Browse files
adamwathanadamwathan
committed
Update fixtures, add system-ui to sans font stack as well
1 parent f07475e commit 7815e01

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

‎__tests__/fixtures/tailwind-output-important.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -407,13 +407,13 @@ ul {
407407
*/
408408

409409
/**
410-
* 1. Use the system font stack as a sane default.
410+
* 1. Use Tailwind's default sans-serif font stack as a sane default.
411411
* 2. Use Tailwind's default "normal" line-height so the user isn't forced
412412
* to override it to ensure consistency even when using the default theme.
413413
*/
414414

415415
html {
416-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
416+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
417417
line-height: 1.5; /* 2 */
418418
}
419419

@@ -3674,7 +3674,7 @@ video {
36743674
}
36753675

36763676
.font-sans {
3677-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
3677+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
36783678
}
36793679

36803680
.font-serif {
@@ -13947,7 +13947,7 @@ video {
1394713947
}
1394813948

1394913949
.sm\:font-sans {
13950-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
13950+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
1395113951
}
1395213952

1395313953
.sm\:font-serif {
@@ -24221,7 +24221,7 @@ video {
2422124221
}
2422224222

2422324223
.md\:font-sans {
24224-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
24224+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
2422524225
}
2422624226

2422724227
.md\:font-serif {
@@ -34495,7 +34495,7 @@ video {
3449534495
}
3449634496

3449734497
.lg\:font-sans {
34498-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
34498+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
3449934499
}
3450034500

3450134501
.lg\:font-serif {
@@ -44769,7 +44769,7 @@ video {
4476944769
}
4477044770

4477144771
.xl\:font-sans {
44772-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
44772+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
4477344773
}
4477444774

4477544775
.xl\:font-serif {

‎__tests__/fixtures/tailwind-output.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -407,13 +407,13 @@ ul {
407407
*/
408408

409409
/**
410-
* 1. Use the system font stack as a sane default.
410+
* 1. Use Tailwind's default sans-serif font stack as a sane default.
411411
* 2. Use Tailwind's default "normal" line-height so the user isn't forced
412412
* to override it to ensure consistency even when using the default theme.
413413
*/
414414

415415
html {
416-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
416+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
417417
line-height: 1.5; /* 2 */
418418
}
419419

@@ -3674,7 +3674,7 @@ video {
36743674
}
36753675

36763676
.font-sans {
3677-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
3677+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
36783678
}
36793679

36803680
.font-serif {
@@ -13947,7 +13947,7 @@ video {
1394713947
}
1394813948

1394913949
.sm\:font-sans {
13950-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
13950+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
1395113951
}
1395213952

1395313953
.sm\:font-serif {
@@ -24221,7 +24221,7 @@ video {
2422124221
}
2422224222

2422324223
.md\:font-sans {
24224-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
24224+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
2422524225
}
2422624226

2422724227
.md\:font-serif {
@@ -34495,7 +34495,7 @@ video {
3449534495
}
3449634496

3449734497
.lg\:font-sans {
34498-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
34498+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
3449934499
}
3450034500

3450134501
.lg\:font-serif {
@@ -44769,7 +44769,7 @@ video {
4476944769
}
4477044770

4477144771
.xl\:font-sans {
44772-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
44772+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
4477344773
}
4477444774

4477544775
.xl\:font-serif {

‎src/plugins/css/preflight.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ ul {
5757
*/
5858

5959
/**
60-
* 1. Use the system font stack as a sane default.
60+
* 1. Use Tailwind's default sans-serif font stack as a sane default.
6161
* 2. Use Tailwind's default "normal" line-height so the user isn't forced
6262
* to override it to ensure consistency even when using the default theme.
6363
*/
6464

6565
html {
66-
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
66+
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
6767
line-height: 1.5; /* 2 */
6868
}
6969

‎stubs/defaultConfig.stub.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ module.exports = {
225225
fontFamily: {
226226
sans: [
227227
'Inter',
228+
'system-ui',
228229
'-apple-system',
229230
'BlinkMacSystemFont',
230231
'"Segoe UI"',

0 commit comments

Comments
 (0)