From 35a4100f1528b66d911cbd3d6eb66020509453f4 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Tue, 12 Mar 2019 20:35:27 -0400 Subject: [PATCH] Default to Tailwind's 'normal' line-height --- __tests__/fixtures/tailwind-output-important.css | 7 +++++-- __tests__/fixtures/tailwind-output.css | 7 +++++-- src/plugins/css/preflight.css | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 08b505b59..8a955c812 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -422,11 +422,14 @@ ul { */ /** - * Use the system font stack as a sane default. + * 1. Use the system font stack as a sane default. + * 2. Use Tailwind's default "normal" line-height so the user isn't forced + * to override it to ensure consistency even when using the default theme. */ html { - 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"; + 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 */ + line-height: 1.5; /* 2 */ } /** diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 333aba29d..88ae63789 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -422,11 +422,14 @@ ul { */ /** - * Use the system font stack as a sane default. + * 1. Use the system font stack as a sane default. + * 2. Use Tailwind's default "normal" line-height so the user isn't forced + * to override it to ensure consistency even when using the default theme. */ html { - 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"; + 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 */ + line-height: 1.5; /* 2 */ } /** diff --git a/src/plugins/css/preflight.css b/src/plugins/css/preflight.css index 55aa2f95d..f3a5d5591 100644 --- a/src/plugins/css/preflight.css +++ b/src/plugins/css/preflight.css @@ -70,11 +70,14 @@ ul { */ /** - * Use the system font stack as a sane default. + * 1. Use the system font stack as a sane default. + * 2. Use Tailwind's default "normal" line-height so the user isn't forced + * to override it to ensure consistency even when using the default theme. */ html { - 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"; + 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 */ + line-height: 1.5; /* 2 */ } /**