From 9d9ceca5e461ef1047b9177c5e633e5d00b76f6b Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Mar 2019 08:41:12 -0400 Subject: [PATCH] Combine wrap-normal and break-normal, rename wrap-break to break-words This preserves backwards compatibility with Tailwind 0.x and provides some useful normalization on top of these two funky ass properties. --- .../fixtures/tailwind-output-important.css | 65 +++++++------------ __tests__/fixtures/tailwind-output.css | 65 +++++++------------ src/plugins/whitespace.js | 9 +-- 3 files changed, 55 insertions(+), 84 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 6230a6479..fe03a35b0 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -7161,18 +7161,15 @@ samp { white-space: pre-wrap !important; } -.wrap-break { - overflow-wrap: break-word !important; -} - -.wrap-normal { - overflow-wrap: normal !important; -} - .break-normal { + overflow-wrap: normal !important; word-break: normal !important; } +.break-words { + overflow-wrap: break-word !important; +} + .break-all { word-break: break-all !important; } @@ -13905,18 +13902,15 @@ samp { white-space: pre-wrap !important; } - .sm\:wrap-break { - overflow-wrap: break-word !important; - } - - .sm\:wrap-normal { - overflow-wrap: normal !important; - } - .sm\:break-normal { + overflow-wrap: normal !important; word-break: normal !important; } + .sm\:break-words { + overflow-wrap: break-word !important; + } + .sm\:break-all { word-break: break-all !important; } @@ -20650,18 +20644,15 @@ samp { white-space: pre-wrap !important; } - .md\:wrap-break { - overflow-wrap: break-word !important; - } - - .md\:wrap-normal { - overflow-wrap: normal !important; - } - .md\:break-normal { + overflow-wrap: normal !important; word-break: normal !important; } + .md\:break-words { + overflow-wrap: break-word !important; + } + .md\:break-all { word-break: break-all !important; } @@ -27395,18 +27386,15 @@ samp { white-space: pre-wrap !important; } - .lg\:wrap-break { - overflow-wrap: break-word !important; - } - - .lg\:wrap-normal { - overflow-wrap: normal !important; - } - .lg\:break-normal { + overflow-wrap: normal !important; word-break: normal !important; } + .lg\:break-words { + overflow-wrap: break-word !important; + } + .lg\:break-all { word-break: break-all !important; } @@ -34140,18 +34128,15 @@ samp { white-space: pre-wrap !important; } - .xl\:wrap-break { - overflow-wrap: break-word !important; - } - - .xl\:wrap-normal { - overflow-wrap: normal !important; - } - .xl\:break-normal { + overflow-wrap: normal !important; word-break: normal !important; } + .xl\:break-words { + overflow-wrap: break-word !important; + } + .xl\:break-all { word-break: break-all !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 89326dfc6..b4c3f1828 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -7161,18 +7161,15 @@ samp { white-space: pre-wrap; } -.wrap-break { - overflow-wrap: break-word; -} - -.wrap-normal { - overflow-wrap: normal; -} - .break-normal { + overflow-wrap: normal; word-break: normal; } +.break-words { + overflow-wrap: break-word; +} + .break-all { word-break: break-all; } @@ -13905,18 +13902,15 @@ samp { white-space: pre-wrap; } - .sm\:wrap-break { - overflow-wrap: break-word; - } - - .sm\:wrap-normal { - overflow-wrap: normal; - } - .sm\:break-normal { + overflow-wrap: normal; word-break: normal; } + .sm\:break-words { + overflow-wrap: break-word; + } + .sm\:break-all { word-break: break-all; } @@ -20650,18 +20644,15 @@ samp { white-space: pre-wrap; } - .md\:wrap-break { - overflow-wrap: break-word; - } - - .md\:wrap-normal { - overflow-wrap: normal; - } - .md\:break-normal { + overflow-wrap: normal; word-break: normal; } + .md\:break-words { + overflow-wrap: break-word; + } + .md\:break-all { word-break: break-all; } @@ -27395,18 +27386,15 @@ samp { white-space: pre-wrap; } - .lg\:wrap-break { - overflow-wrap: break-word; - } - - .lg\:wrap-normal { - overflow-wrap: normal; - } - .lg\:break-normal { + overflow-wrap: normal; word-break: normal; } + .lg\:break-words { + overflow-wrap: break-word; + } + .lg\:break-all { word-break: break-all; } @@ -34140,18 +34128,15 @@ samp { white-space: pre-wrap; } - .xl\:wrap-break { - overflow-wrap: break-word; - } - - .xl\:wrap-normal { - overflow-wrap: normal; - } - .xl\:break-normal { + overflow-wrap: normal; word-break: normal; } + .xl\:break-words { + overflow-wrap: break-word; + } + .xl\:break-all { word-break: break-all; } diff --git a/src/plugins/whitespace.js b/src/plugins/whitespace.js index 61bf32d32..d64613781 100644 --- a/src/plugins/whitespace.js +++ b/src/plugins/whitespace.js @@ -8,10 +8,11 @@ export default function() { '.whitespace-pre-line': { 'white-space': 'pre-line' }, '.whitespace-pre-wrap': { 'white-space': 'pre-wrap' }, - '.wrap-break': { 'overflow-wrap': 'break-word' }, - '.wrap-normal': { 'overflow-wrap': 'normal' }, - - '.break-normal': { 'word-break': 'normal' }, + '.break-normal': { + 'overflow-wrap': 'normal', + 'word-break': 'normal', + }, + '.break-words': { 'overflow-wrap': 'break-word' }, '.break-all': { 'word-break': 'break-all' }, '.truncate': {