From 2c08993f891ce690f88634c9dc4ebe8bf5da7c37 Mon Sep 17 00:00:00 2001 From: Seth Warburton Date: Thu, 11 Jan 2018 16:45:50 +0000 Subject: [PATCH] [Fixed] Provide a safer and future-proofed system font stack --- __tests__/fixtures/tailwind-output.css | 10 +++++----- defaultConfig.stub.js | 3 ++- docs/source/docs/fonts.blade.md | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index cf9ecd3812ef..e936cd8277c6 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -2378,7 +2378,7 @@ button, } .font-sans { - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + font-family: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } .font-serif { @@ -6261,7 +6261,7 @@ button, } .sm\:font-sans { - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + font-family: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } .sm\:font-serif { @@ -10137,7 +10137,7 @@ button, } .md\:font-sans { - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + font-family: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } .md\:font-serif { @@ -14013,7 +14013,7 @@ button, } .lg\:font-sans { - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + font-family: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } .lg\:font-serif { @@ -17889,7 +17889,7 @@ button, } .xl\:font-sans { - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + font-family: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } .xl\:font-serif { diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 828ee9d49aeb..d2e5ab7f8277 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -194,8 +194,9 @@ module.exports = { fonts: { 'sans': [ - '-apple-system', + 'system-ui', 'BlinkMacSystemFont', + '-apple-system', 'Segoe UI', 'Roboto', 'Oxygen', diff --git a/docs/source/docs/fonts.blade.md b/docs/source/docs/fonts.blade.md index 2c7d8fcd3b51..d08385d6e53a 100644 --- a/docs/source/docs/fonts.blade.md +++ b/docs/source/docs/fonts.blade.md @@ -15,7 +15,7 @@ features: 'rows' => [ [ '.font-sans', - "font-family:\n -apple-system,\n BlinkMacSystemFont,\n Segoe UI,\n Roboto,\n Oxygen,\n Ubuntu,\n Cantarell,\n Fira Sans,\n Droid Sans,\n Helvetica Neue,\n sans-serif;", + "font-family:\n system-ui,\n BlinkMacSystemFont,\n -apple-system,\n Segoe UI,\n Roboto,\n Oxygen,\n Ubuntu,\n Cantarell,\n Fira Sans,\n Droid Sans,\n Helvetica Neue,\n sans-serif;", 'Set the font family to the sans font stack.', ], [