From 9fa075c15410d6a9f0606f8b560a43fb2eee6ea3 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Tue, 12 Mar 2019 19:58:55 -0400 Subject: [PATCH] Update default monospace font stack to match Bootstrap --- __tests__/fixtures/tailwind-output-important.css | 10 +++++----- __tests__/fixtures/tailwind-output.css | 10 +++++----- defaultTheme.js | 10 +++++++++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 9cc0dd771..3f49562b5 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -2922,7 +2922,7 @@ textarea { } .font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace !important; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; } .font-hairline { @@ -8943,7 +8943,7 @@ textarea { } .sm\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace !important; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; } .sm\:font-hairline { @@ -14949,7 +14949,7 @@ textarea { } .md\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace !important; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; } .md\:font-hairline { @@ -20955,7 +20955,7 @@ textarea { } .lg\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace !important; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; } .lg\:font-hairline { @@ -26961,7 +26961,7 @@ textarea { } .xl\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace !important; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; } .xl\:font-hairline { diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 6232f0834..a164cf933 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -2922,7 +2922,7 @@ textarea { } .font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } .font-hairline { @@ -8943,7 +8943,7 @@ textarea { } .sm\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } .sm\:font-hairline { @@ -14949,7 +14949,7 @@ textarea { } .md\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } .md\:font-hairline { @@ -20955,7 +20955,7 @@ textarea { } .lg\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } .lg\:font-hairline { @@ -26961,7 +26961,7 @@ textarea { } .xl\:font-mono { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } .xl\:font-hairline { diff --git a/defaultTheme.js b/defaultTheme.js index d28b6ee39..c29653e78 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -139,7 +139,15 @@ module.exports = function() { 'Georgia', 'serif', ], - mono: ['Menlo', 'Monaco', 'Consolas', 'Liberation Mono', 'Courier New', 'monospace'], + mono: [ + 'SFMono-Regular', + 'Menlo', + 'Monaco', + 'Consolas', + '"Liberation Mono"', + '"Courier New"', + 'monospace', + ], }, fontSize: { xs: '.75rem',