From d3c65e55af3a80f3e0a0510400084950067f4664 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Tue, 12 Feb 2019 15:14:35 -0500 Subject: [PATCH 01/17] Rename fonts plugin to fontFamily --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/fontFamily.js | 1 + plugins/fonts.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{fonts.js => fontFamily.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/fontFamily.js delete mode 100644 plugins/fonts.js rename src/plugins/{fonts.js => fontFamily.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index e204a0437..66f1da688 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -21,7 +21,7 @@ module.exports = { display: ['responsive'], flexbox: ['responsive'], float: ['responsive'], - fonts: ['responsive'], + fontFamily: ['responsive'], fontWeights: ['responsive', 'hover', 'focus'], height: ['responsive'], leading: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index d940c29ae..de29a6a15 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -91,7 +91,7 @@ module.exports = function() { lg: '992px', xl: '1200px', }, - fonts: { + fontFamily: { sans: [ 'system-ui', 'BlinkMacSystemFont', diff --git a/plugins/fontFamily.js b/plugins/fontFamily.js new file mode 100644 index 000000000..917cd1572 --- /dev/null +++ b/plugins/fontFamily.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/fontFamily').default diff --git a/plugins/fonts.js b/plugins/fonts.js deleted file mode 100644 index cc2b7b5d6..000000000 --- a/plugins/fonts.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/fonts').default diff --git a/src/corePlugins.js b/src/corePlugins.js index ede2c9b04..40ea0458c 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -15,7 +15,7 @@ import cursor from './plugins/cursor' import display from './plugins/display' import flexbox from './plugins/flexbox' import float from './plugins/float' -import fonts from './plugins/fonts' +import fontFamily from './plugins/fontFamily' import fontWeights from './plugins/fontWeights' import height from './plugins/height' import leading from './plugins/leading' @@ -86,7 +86,7 @@ export default function(config) { display, flexbox, float, - fonts, + fontFamily, fontWeights, height, leading, diff --git a/src/plugins/fonts.js b/src/plugins/fontFamily.js similarity index 100% rename from src/plugins/fonts.js rename to src/plugins/fontFamily.js From 376daf334505b08d17e4fd612da004afa4a0458a Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:20:07 -0500 Subject: [PATCH 02/17] Rename backgroundColors to backgroundColor --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/backgroundColor.js | 1 + plugins/backgroundColors.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{backgroundColors.js => backgroundColor.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/backgroundColor.js delete mode 100644 plugins/backgroundColors.js rename src/plugins/{backgroundColors.js => backgroundColor.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 66f1da688..30e0bd670 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -8,7 +8,7 @@ module.exports = { variants: { appearance: ['responsive'], backgroundAttachment: ['responsive'], - backgroundColors: ['responsive', 'hover', 'focus'], + backgroundColor: ['responsive', 'hover', 'focus'], backgroundPosition: ['responsive'], backgroundRepeat: ['responsive'], backgroundSize: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index de29a6a15..27b40c215 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -154,7 +154,7 @@ module.exports = function() { wide: '0.05em', }, textColors: theme => theme.colors, - backgroundColors: theme => theme.colors, + backgroundColor: theme => theme.colors, backgroundPosition: { bottom: 'bottom', center: 'center', diff --git a/plugins/backgroundColor.js b/plugins/backgroundColor.js new file mode 100644 index 000000000..c3ad7c700 --- /dev/null +++ b/plugins/backgroundColor.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/backgroundColor').default diff --git a/plugins/backgroundColors.js b/plugins/backgroundColors.js deleted file mode 100644 index c3928bee8..000000000 --- a/plugins/backgroundColors.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/backgroundColors').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 40ea0458c..7637e6573 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -2,7 +2,7 @@ import preflight from './plugins/preflight' import lists from './plugins/lists' import appearance from './plugins/appearance' import backgroundAttachment from './plugins/backgroundAttachment' -import backgroundColors from './plugins/backgroundColors' +import backgroundColor from './plugins/backgroundColor' import backgroundPosition from './plugins/backgroundPosition' import backgroundRepeat from './plugins/backgroundRepeat' import backgroundSize from './plugins/backgroundSize' @@ -73,7 +73,7 @@ export default function(config) { lists, appearance, backgroundAttachment, - backgroundColors, + backgroundColor, backgroundPosition, backgroundRepeat, backgroundSize, diff --git a/src/plugins/backgroundColors.js b/src/plugins/backgroundColor.js similarity index 100% rename from src/plugins/backgroundColors.js rename to src/plugins/backgroundColor.js From df8fe5afa67e5325cfc10cc437934ffeca3a5436 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:23:22 -0500 Subject: [PATCH 03/17] Rename borderColors to borderColor --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/borderColor.js | 1 + plugins/borderColors.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{borderColors.js => borderColor.js} | 0 src/plugins/css/preflight.css | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 plugins/borderColor.js delete mode 100644 plugins/borderColors.js rename src/plugins/{borderColors.js => borderColor.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 30e0bd670..7f4d6093e 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -13,7 +13,7 @@ module.exports = { backgroundRepeat: ['responsive'], backgroundSize: ['responsive'], borderCollapse: [], - borderColors: ['responsive', 'hover', 'focus'], + borderColor: ['responsive', 'hover', 'focus'], borderRadius: ['responsive'], borderStyle: ['responsive'], borderWidths: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 27b40c215..8e5d122a1 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -178,7 +178,7 @@ module.exports = function() { '4': '4px', '8': '8px', }, - borderColors: theme => { + borderColor: theme => { return global.Object.assign({ default: theme.colors['grey-light'] }, theme.colors) }, borderRadius: { diff --git a/plugins/borderColor.js b/plugins/borderColor.js new file mode 100644 index 000000000..006b437a4 --- /dev/null +++ b/plugins/borderColor.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/borderColor').default diff --git a/plugins/borderColors.js b/plugins/borderColors.js deleted file mode 100644 index 77bb95775..000000000 --- a/plugins/borderColors.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/borderColors').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 7637e6573..8685e128b 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -7,7 +7,7 @@ import backgroundPosition from './plugins/backgroundPosition' import backgroundRepeat from './plugins/backgroundRepeat' import backgroundSize from './plugins/backgroundSize' import borderCollapse from './plugins/borderCollapse' -import borderColors from './plugins/borderColors' +import borderColor from './plugins/borderColor' import borderRadius from './plugins/borderRadius' import borderStyle from './plugins/borderStyle' import borderWidths from './plugins/borderWidths' @@ -78,7 +78,7 @@ export default function(config) { backgroundRepeat, backgroundSize, borderCollapse, - borderColors, + borderColor, borderRadius, borderStyle, borderWidths, diff --git a/src/plugins/borderColors.js b/src/plugins/borderColor.js similarity index 100% rename from src/plugins/borderColors.js rename to src/plugins/borderColor.js diff --git a/src/plugins/css/preflight.css b/src/plugins/css/preflight.css index 56a532c18..24d4dcc20 100644 --- a/src/plugins/css/preflight.css +++ b/src/plugins/css/preflight.css @@ -89,7 +89,7 @@ ul { *::after { border-width: 0; border-style: solid; - border-color: config('theme.borderColors.default', currentColor); + border-color: config('theme.borderColor.default', currentColor); } /** From 856fdbc3dd25f96c8ec9b59e048ad2e23a52f5d5 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:24:15 -0500 Subject: [PATCH 04/17] Rename borderWidths to borderWidth --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/borderWidth.js | 1 + plugins/borderWidths.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{borderWidths.js => borderWidth.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/borderWidth.js delete mode 100644 plugins/borderWidths.js rename src/plugins/{borderWidths.js => borderWidth.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 7f4d6093e..d70e5ea5e 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -16,7 +16,7 @@ module.exports = { borderColor: ['responsive', 'hover', 'focus'], borderRadius: ['responsive'], borderStyle: ['responsive'], - borderWidths: ['responsive'], + borderWidth: ['responsive'], cursor: ['responsive'], display: ['responsive'], flexbox: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 8e5d122a1..d49d72531 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -171,7 +171,7 @@ module.exports = function() { cover: 'cover', contain: 'contain', }, - borderWidths: { + borderWidth: { default: '1px', '0': '0', '2': '2px', diff --git a/plugins/borderWidth.js b/plugins/borderWidth.js new file mode 100644 index 000000000..baf1dade7 --- /dev/null +++ b/plugins/borderWidth.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/borderWidth').default diff --git a/plugins/borderWidths.js b/plugins/borderWidths.js deleted file mode 100644 index e61fea17f..000000000 --- a/plugins/borderWidths.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/borderWidths').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 8685e128b..948db4044 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -10,7 +10,7 @@ import borderCollapse from './plugins/borderCollapse' import borderColor from './plugins/borderColor' import borderRadius from './plugins/borderRadius' import borderStyle from './plugins/borderStyle' -import borderWidths from './plugins/borderWidths' +import borderWidth from './plugins/borderWidth' import cursor from './plugins/cursor' import display from './plugins/display' import flexbox from './plugins/flexbox' @@ -81,7 +81,7 @@ export default function(config) { borderColor, borderRadius, borderStyle, - borderWidths, + borderWidth, cursor, display, flexbox, diff --git a/src/plugins/borderWidths.js b/src/plugins/borderWidth.js similarity index 100% rename from src/plugins/borderWidths.js rename to src/plugins/borderWidth.js From af65b45a4c737ccedcd31dc6d84c68eda5e317e3 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:25:35 -0500 Subject: [PATCH 05/17] Rename fontWeights to fontWeight --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/fontWeight.js | 1 + plugins/fontWeights.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{fontWeights.js => fontWeight.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/fontWeight.js delete mode 100644 plugins/fontWeights.js rename src/plugins/{fontWeights.js => fontWeight.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index d70e5ea5e..9084e0f5d 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -22,7 +22,7 @@ module.exports = { flexbox: ['responsive'], float: ['responsive'], fontFamily: ['responsive'], - fontWeights: ['responsive', 'hover', 'focus'], + fontWeight: ['responsive', 'hover', 'focus'], height: ['responsive'], leading: ['responsive'], lists: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index d49d72531..0cf114011 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -131,7 +131,7 @@ module.exports = function() { '4xl': '2.25rem', // 36px '5xl': '3rem', // 48px }, - fontWeights: { + fontWeight: { hairline: 100, thin: 200, light: 300, diff --git a/plugins/fontWeight.js b/plugins/fontWeight.js new file mode 100644 index 000000000..d5ab337c4 --- /dev/null +++ b/plugins/fontWeight.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/fontWeight').default diff --git a/plugins/fontWeights.js b/plugins/fontWeights.js deleted file mode 100644 index c6e1592a4..000000000 --- a/plugins/fontWeights.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/fontWeights').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 948db4044..a10cbd69d 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -16,7 +16,7 @@ import display from './plugins/display' import flexbox from './plugins/flexbox' import float from './plugins/float' import fontFamily from './plugins/fontFamily' -import fontWeights from './plugins/fontWeights' +import fontWeight from './plugins/fontWeight' import height from './plugins/height' import leading from './plugins/leading' import margin from './plugins/margin' @@ -87,7 +87,7 @@ export default function(config) { flexbox, float, fontFamily, - fontWeights, + fontWeight, height, leading, margin, diff --git a/src/plugins/fontWeights.js b/src/plugins/fontWeight.js similarity index 100% rename from src/plugins/fontWeights.js rename to src/plugins/fontWeight.js From 4b717aad56468611a5562a6cd783a4b9cff4356b Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:31:19 -0500 Subject: [PATCH 06/17] Rename leading plugin to lineHeight --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/leading.js | 1 - plugins/lineHeight.js | 1 + src/corePlugins.js | 4 ++-- src/plugins/{leading.js => lineHeight.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 plugins/leading.js create mode 100644 plugins/lineHeight.js rename src/plugins/{leading.js => lineHeight.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 9084e0f5d..4de363f1f 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -24,7 +24,7 @@ module.exports = { fontFamily: ['responsive'], fontWeight: ['responsive', 'hover', 'focus'], height: ['responsive'], - leading: ['responsive'], + lineHeight: ['responsive'], lists: ['responsive'], margin: ['responsive'], maxHeight: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 0cf114011..513450cff 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -142,7 +142,7 @@ module.exports = function() { extrabold: 800, black: 900, }, - leading: { + lineHeight: { none: 1, tight: 1.25, normal: 1.5, diff --git a/plugins/leading.js b/plugins/leading.js deleted file mode 100644 index 231aeb9ed..000000000 --- a/plugins/leading.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/leading').default diff --git a/plugins/lineHeight.js b/plugins/lineHeight.js new file mode 100644 index 000000000..31977ffaa --- /dev/null +++ b/plugins/lineHeight.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/lineHeight').default diff --git a/src/corePlugins.js b/src/corePlugins.js index a10cbd69d..a8f40e5f1 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -18,7 +18,7 @@ import float from './plugins/float' import fontFamily from './plugins/fontFamily' import fontWeight from './plugins/fontWeight' import height from './plugins/height' -import leading from './plugins/leading' +import lineHeight from './plugins/lineHeight' import margin from './plugins/margin' import maxHeight from './plugins/maxHeight' import maxWidth from './plugins/maxWidth' @@ -89,7 +89,7 @@ export default function(config) { fontFamily, fontWeight, height, - leading, + lineHeight, margin, maxHeight, maxWidth, diff --git a/src/plugins/leading.js b/src/plugins/lineHeight.js similarity index 100% rename from src/plugins/leading.js rename to src/plugins/lineHeight.js From b6b67e1c8cc8fe6552d7bfb6d1a5b4ce71fb8b47 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:32:38 -0500 Subject: [PATCH 07/17] Rename shadows to boxShadow --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/boxShadow.js | 1 + plugins/shadows.js | 1 - src/plugins/{shadows.js => boxShadow.js} | 0 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 plugins/boxShadow.js delete mode 100644 plugins/shadows.js rename src/plugins/{shadows.js => boxShadow.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 4de363f1f..6fbddbd99 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -41,7 +41,7 @@ module.exports = { pointerEvents: ['responsive'], position: ['responsive'], resize: ['responsive'], - shadows: ['responsive', 'hover', 'focus'], + boxShadow: ['responsive', 'hover', 'focus'], svgFill: [], svgStroke: [], tableLayout: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 513450cff..d3ecdb65d 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -316,7 +316,7 @@ module.exports = function() { '24': '6rem', '32': '8rem', }, - shadows: { + boxShadow: { default: '0 2px 4px 0 rgba(0,0,0,0.10)', md: '0 4px 8px 0 rgba(0,0,0,0.12), 0 2px 4px 0 rgba(0,0,0,0.08)', lg: '0 15px 30px 0 rgba(0,0,0,0.11), 0 5px 15px 0 rgba(0,0,0,0.08)', diff --git a/plugins/boxShadow.js b/plugins/boxShadow.js new file mode 100644 index 000000000..269127242 --- /dev/null +++ b/plugins/boxShadow.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/boxShadow').default diff --git a/plugins/shadows.js b/plugins/shadows.js deleted file mode 100644 index 553a4c2ee..000000000 --- a/plugins/shadows.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/shadows').default diff --git a/src/plugins/shadows.js b/src/plugins/boxShadow.js similarity index 100% rename from src/plugins/shadows.js rename to src/plugins/boxShadow.js From 7abbf520dfa0818e386af4a85fd1e5a310ca46fd Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:33:51 -0500 Subject: [PATCH 08/17] Rename svgFill to fill --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/fill.js | 1 + plugins/svgFill.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{svgFill.js => fill.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/fill.js delete mode 100644 plugins/svgFill.js rename src/plugins/{svgFill.js => fill.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 6fbddbd99..0e9f61e60 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -42,7 +42,7 @@ module.exports = { position: ['responsive'], resize: ['responsive'], boxShadow: ['responsive', 'hover', 'focus'], - svgFill: [], + fill: [], svgStroke: [], tableLayout: ['responsive'], textAlign: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index d3ecdb65d..a3c68cb30 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -340,7 +340,7 @@ module.exports = function() { '75': '.75', '100': '1', }, - svgFill: { + fill: { current: 'currentColor', }, svgStroke: { diff --git a/plugins/fill.js b/plugins/fill.js new file mode 100644 index 000000000..b073d1f3d --- /dev/null +++ b/plugins/fill.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/fill').default diff --git a/plugins/svgFill.js b/plugins/svgFill.js deleted file mode 100644 index af6efaf7c..000000000 --- a/plugins/svgFill.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/svgFill').default diff --git a/src/corePlugins.js b/src/corePlugins.js index a8f40e5f1..2f61226ea 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -35,7 +35,7 @@ import pointerEvents from './plugins/pointerEvents' import position from './plugins/position' import resize from './plugins/resize' import shadows from './plugins/shadows' -import svgFill from './plugins/svgFill' +import fill from './plugins/fill' import svgStroke from './plugins/svgStroke' import tableLayout from './plugins/tableLayout' import textAlign from './plugins/textAlign' @@ -106,7 +106,7 @@ export default function(config) { position, resize, shadows, - svgFill, + fill, svgStroke, tableLayout, textAlign, diff --git a/src/plugins/svgFill.js b/src/plugins/fill.js similarity index 100% rename from src/plugins/svgFill.js rename to src/plugins/fill.js From 45c5e69708f20a280aed81b5f1146538db3b9cdb Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:34:07 -0500 Subject: [PATCH 09/17] Update shadows to boxShadow in corePlugins --- src/corePlugins.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corePlugins.js b/src/corePlugins.js index 2f61226ea..964bcfff3 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -34,7 +34,7 @@ import padding from './plugins/padding' import pointerEvents from './plugins/pointerEvents' import position from './plugins/position' import resize from './plugins/resize' -import shadows from './plugins/shadows' +import boxShadow from './plugins/boxShadow' import fill from './plugins/fill' import svgStroke from './plugins/svgStroke' import tableLayout from './plugins/tableLayout' @@ -105,7 +105,7 @@ export default function(config) { pointerEvents, position, resize, - shadows, + boxShadow, fill, svgStroke, tableLayout, From e9f86cc2955e910078b3764cdd3ce60f16044c62 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 15:20:05 -0500 Subject: [PATCH 10/17] Rename svgStroke to stroke --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/stroke.js | 1 + plugins/svgStroke.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{svgStroke.js => stroke.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/stroke.js delete mode 100644 plugins/svgStroke.js rename src/plugins/{svgStroke.js => stroke.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 0e9f61e60..ce107c575 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -43,7 +43,7 @@ module.exports = { resize: ['responsive'], boxShadow: ['responsive', 'hover', 'focus'], fill: [], - svgStroke: [], + stroke: [], tableLayout: ['responsive'], textAlign: ['responsive'], textColors: ['responsive', 'hover', 'focus'], diff --git a/defaultTheme.js b/defaultTheme.js index a3c68cb30..aa5b556b5 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -343,7 +343,7 @@ module.exports = function() { fill: { current: 'currentColor', }, - svgStroke: { + stroke: { current: 'currentColor', }, } diff --git a/plugins/stroke.js b/plugins/stroke.js new file mode 100644 index 000000000..a1a98e3c3 --- /dev/null +++ b/plugins/stroke.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/stroke').default diff --git a/plugins/svgStroke.js b/plugins/svgStroke.js deleted file mode 100644 index 24d667496..000000000 --- a/plugins/svgStroke.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/svgStroke').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 964bcfff3..a4fed05bb 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -36,7 +36,7 @@ import position from './plugins/position' import resize from './plugins/resize' import boxShadow from './plugins/boxShadow' import fill from './plugins/fill' -import svgStroke from './plugins/svgStroke' +import stroke from './plugins/stroke' import tableLayout from './plugins/tableLayout' import textAlign from './plugins/textAlign' import textColors from './plugins/textColors' @@ -107,7 +107,7 @@ export default function(config) { resize, boxShadow, fill, - svgStroke, + stroke, tableLayout, textAlign, textColors, diff --git a/src/plugins/svgStroke.js b/src/plugins/stroke.js similarity index 100% rename from src/plugins/svgStroke.js rename to src/plugins/stroke.js From ab9277d3ebc82f38591a8d821d085be88200d795 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 15:21:27 -0500 Subject: [PATCH 11/17] Rename textSizes to fontSize --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/fontSize.js | 1 + plugins/textSizes.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{textSizes.js => fontSize.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/fontSize.js delete mode 100644 plugins/textSizes.js rename src/plugins/{textSizes.js => fontSize.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index ce107c575..f447c988a 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -47,7 +47,7 @@ module.exports = { tableLayout: ['responsive'], textAlign: ['responsive'], textColors: ['responsive', 'hover', 'focus'], - textSizes: ['responsive'], + fontSize: ['responsive'], textStyle: ['responsive', 'hover', 'focus'], tracking: ['responsive'], userSelect: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index aa5b556b5..997a41840 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -120,7 +120,7 @@ module.exports = function() { ], mono: ['Menlo', 'Monaco', 'Consolas', 'Liberation Mono', 'Courier New', 'monospace'], }, - textSizes: { + fontSize: { xs: '.75rem', // 12px sm: '.875rem', // 14px base: '1rem', // 16px diff --git a/plugins/fontSize.js b/plugins/fontSize.js new file mode 100644 index 000000000..d271e7e1e --- /dev/null +++ b/plugins/fontSize.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/fontSize').default diff --git a/plugins/textSizes.js b/plugins/textSizes.js deleted file mode 100644 index 98c963892..000000000 --- a/plugins/textSizes.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/textSizes').default diff --git a/src/corePlugins.js b/src/corePlugins.js index a4fed05bb..38d9e95a8 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -40,7 +40,7 @@ import stroke from './plugins/stroke' import tableLayout from './plugins/tableLayout' import textAlign from './plugins/textAlign' import textColors from './plugins/textColors' -import textSizes from './plugins/textSizes' +import fontSize from './plugins/fontSize' import textStyle from './plugins/textStyle' import tracking from './plugins/tracking' import userSelect from './plugins/userSelect' @@ -111,7 +111,7 @@ export default function(config) { tableLayout, textAlign, textColors, - textSizes, + fontSize, textStyle, tracking, userSelect, diff --git a/src/plugins/textSizes.js b/src/plugins/fontSize.js similarity index 100% rename from src/plugins/textSizes.js rename to src/plugins/fontSize.js From 36c2a6076613fb4701c007fbccfe7241c7d7ff50 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 15:24:40 -0500 Subject: [PATCH 12/17] Rename tracking to letterSpacing --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/letterSpacing.js | 1 + plugins/tracking.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{tracking.js => letterSpacing.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/letterSpacing.js delete mode 100644 plugins/tracking.js rename src/plugins/{tracking.js => letterSpacing.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index f447c988a..0cb3d31f4 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -49,7 +49,7 @@ module.exports = { textColors: ['responsive', 'hover', 'focus'], fontSize: ['responsive'], textStyle: ['responsive', 'hover', 'focus'], - tracking: ['responsive'], + letterSpacing: ['responsive'], userSelect: ['responsive'], verticalAlign: ['responsive'], visibility: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 997a41840..26e32dff4 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -148,7 +148,7 @@ module.exports = function() { normal: 1.5, loose: 2, }, - tracking: { + letterSpacing: { tight: '-0.05em', normal: '0', wide: '0.05em', diff --git a/plugins/letterSpacing.js b/plugins/letterSpacing.js new file mode 100644 index 000000000..20be9ee84 --- /dev/null +++ b/plugins/letterSpacing.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/letterSpacing').default diff --git a/plugins/tracking.js b/plugins/tracking.js deleted file mode 100644 index 1e44f581c..000000000 --- a/plugins/tracking.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/tracking').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 38d9e95a8..ac7a95c07 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -42,7 +42,7 @@ import textAlign from './plugins/textAlign' import textColors from './plugins/textColors' import fontSize from './plugins/fontSize' import textStyle from './plugins/textStyle' -import tracking from './plugins/tracking' +import letterSpacing from './plugins/letterSpacing' import userSelect from './plugins/userSelect' import verticalAlign from './plugins/verticalAlign' import visibility from './plugins/visibility' @@ -113,7 +113,7 @@ export default function(config) { textColors, fontSize, textStyle, - tracking, + letterSpacing, userSelect, verticalAlign, visibility, diff --git a/src/plugins/tracking.js b/src/plugins/letterSpacing.js similarity index 100% rename from src/plugins/tracking.js rename to src/plugins/letterSpacing.js From 76b208dc83387bb5467dc315b07ac2f33504e9a9 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 15:30:43 -0500 Subject: [PATCH 13/17] Rename lists to listStyle --- defaultConfig.stub.js | 2 +- plugins/listStyle.js | 1 + plugins/lists.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{lists.js => listStyle.js} | 0 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 plugins/listStyle.js delete mode 100644 plugins/lists.js rename src/plugins/{lists.js => listStyle.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 0cb3d31f4..b67879ce9 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -25,7 +25,7 @@ module.exports = { fontWeight: ['responsive', 'hover', 'focus'], height: ['responsive'], lineHeight: ['responsive'], - lists: ['responsive'], + listStyle: ['responsive'], margin: ['responsive'], maxHeight: ['responsive'], maxWidth: ['responsive'], diff --git a/plugins/listStyle.js b/plugins/listStyle.js new file mode 100644 index 000000000..ea0aba9a1 --- /dev/null +++ b/plugins/listStyle.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/listStyle').default diff --git a/plugins/lists.js b/plugins/lists.js deleted file mode 100644 index 3037be21b..000000000 --- a/plugins/lists.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/lists').default diff --git a/src/corePlugins.js b/src/corePlugins.js index ac7a95c07..a90e8239a 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -1,5 +1,5 @@ import preflight from './plugins/preflight' -import lists from './plugins/lists' +import listStyle from './plugins/listStyle' import appearance from './plugins/appearance' import backgroundAttachment from './plugins/backgroundAttachment' import backgroundColor from './plugins/backgroundColor' @@ -70,7 +70,7 @@ function loadPlugins({ theme, variants, corePlugins }, plugins) { export default function(config) { return loadPlugins(config, { preflight, - lists, + listStyle, appearance, backgroundAttachment, backgroundColor, diff --git a/src/plugins/lists.js b/src/plugins/listStyle.js similarity index 100% rename from src/plugins/lists.js rename to src/plugins/listStyle.js From ec0b9ae68e4c9016520a5d6ed113c94dd12a156e Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 15:31:06 -0500 Subject: [PATCH 14/17] Rename textColors to textColor --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/textColor.js | 1 + plugins/textColors.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{textColors.js => textColor.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/textColor.js delete mode 100644 plugins/textColors.js rename src/plugins/{textColors.js => textColor.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index b67879ce9..171621924 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -46,7 +46,7 @@ module.exports = { stroke: [], tableLayout: ['responsive'], textAlign: ['responsive'], - textColors: ['responsive', 'hover', 'focus'], + textColor: ['responsive', 'hover', 'focus'], fontSize: ['responsive'], textStyle: ['responsive', 'hover', 'focus'], letterSpacing: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 26e32dff4..a0571d2f8 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -153,7 +153,7 @@ module.exports = function() { normal: '0', wide: '0.05em', }, - textColors: theme => theme.colors, + textColor: theme => theme.colors, backgroundColor: theme => theme.colors, backgroundPosition: { bottom: 'bottom', diff --git a/plugins/textColor.js b/plugins/textColor.js new file mode 100644 index 000000000..de8d95813 --- /dev/null +++ b/plugins/textColor.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/textColor').default diff --git a/plugins/textColors.js b/plugins/textColors.js deleted file mode 100644 index 83a71ac99..000000000 --- a/plugins/textColors.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/textColors').default diff --git a/src/corePlugins.js b/src/corePlugins.js index a90e8239a..221e506a4 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -39,7 +39,7 @@ import fill from './plugins/fill' import stroke from './plugins/stroke' import tableLayout from './plugins/tableLayout' import textAlign from './plugins/textAlign' -import textColors from './plugins/textColors' +import textColor from './plugins/textColor' import fontSize from './plugins/fontSize' import textStyle from './plugins/textStyle' import letterSpacing from './plugins/letterSpacing' @@ -110,7 +110,7 @@ export default function(config) { stroke, tableLayout, textAlign, - textColors, + textColor, fontSize, textStyle, letterSpacing, diff --git a/src/plugins/textColors.js b/src/plugins/textColor.js similarity index 100% rename from src/plugins/textColors.js rename to src/plugins/textColor.js From c2f62c1c6cf1cadf218da1c9eef8c8868ed3632d Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 16:12:49 -0500 Subject: [PATCH 15/17] Split textStyle plugin into one plugin per CSS property --- .../fixtures/tailwind-output-important.css | 600 +++++++++--------- __tests__/fixtures/tailwind-output.css | 600 +++++++++--------- defaultConfig.stub.js | 5 +- plugins/fontSmoothing.js | 1 + plugins/fontStyle.js | 1 + plugins/textDecoration.js | 1 + plugins/textStyle.js | 1 - plugins/textTransform.js | 1 + src/corePlugins.js | 10 +- src/plugins/fontSmoothing.js | 17 + src/plugins/fontStyle.js | 11 + src/plugins/textDecoration.js | 12 + src/plugins/textStyle.js | 29 - src/plugins/textTransform.js | 13 + 14 files changed, 669 insertions(+), 633 deletions(-) create mode 100644 plugins/fontSmoothing.js create mode 100644 plugins/fontStyle.js create mode 100644 plugins/textDecoration.js delete mode 100644 plugins/textStyle.js create mode 100644 plugins/textTransform.js create mode 100644 src/plugins/fontSmoothing.js create mode 100644 src/plugins/fontStyle.js create mode 100644 src/plugins/textDecoration.js delete mode 100644 src/plugins/textStyle.js create mode 100644 src/plugins/textTransform.js diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 36c54bc34..5c9374c30 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -5733,6 +5733,22 @@ table { font-style: normal !important; } +.hover\:italic:hover { + font-style: italic !important; +} + +.hover\:roman:hover { + font-style: normal !important; +} + +.focus\:italic:focus { + font-style: italic !important; +} + +.focus\:roman:focus { + font-style: normal !important; +} + .uppercase { text-transform: uppercase !important; } @@ -5749,36 +5765,6 @@ table { text-transform: none !important; } -.underline { - text-decoration: underline !important; -} - -.line-through { - text-decoration: line-through !important; -} - -.no-underline { - text-decoration: none !important; -} - -.antialiased { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; -} - -.subpixel-antialiased { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; -} - -.hover\:italic:hover { - font-style: italic !important; -} - -.hover\:roman:hover { - font-style: normal !important; -} - .hover\:uppercase:hover { text-transform: uppercase !important; } @@ -5795,36 +5781,6 @@ table { text-transform: none !important; } -.hover\:underline:hover { - text-decoration: underline !important; -} - -.hover\:line-through:hover { - text-decoration: line-through !important; -} - -.hover\:no-underline:hover { - text-decoration: none !important; -} - -.hover\:antialiased:hover { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; -} - -.hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; -} - -.focus\:italic:focus { - font-style: italic !important; -} - -.focus\:roman:focus { - font-style: normal !important; -} - .focus\:uppercase:focus { text-transform: uppercase !important; } @@ -5841,6 +5797,30 @@ table { text-transform: none !important; } +.underline { + text-decoration: underline !important; +} + +.line-through { + text-decoration: line-through !important; +} + +.no-underline { + text-decoration: none !important; +} + +.hover\:underline:hover { + text-decoration: underline !important; +} + +.hover\:line-through:hover { + text-decoration: line-through !important; +} + +.hover\:no-underline:hover { + text-decoration: none !important; +} + .focus\:underline:focus { text-decoration: underline !important; } @@ -5853,6 +5833,26 @@ table { text-decoration: none !important; } +.antialiased { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; +} + +.subpixel-antialiased { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; +} + +.hover\:antialiased:hover { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; +} + +.hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; +} + .focus\:antialiased:focus { -webkit-font-smoothing: antialiased !important; -moz-osx-font-smoothing: grayscale !important; @@ -11302,6 +11302,22 @@ table { font-style: normal !important; } + .sm\:hover\:italic:hover { + font-style: italic !important; + } + + .sm\:hover\:roman:hover { + font-style: normal !important; + } + + .sm\:focus\:italic:focus { + font-style: italic !important; + } + + .sm\:focus\:roman:focus { + font-style: normal !important; + } + .sm\:uppercase { text-transform: uppercase !important; } @@ -11318,36 +11334,6 @@ table { text-transform: none !important; } - .sm\:underline { - text-decoration: underline !important; - } - - .sm\:line-through { - text-decoration: line-through !important; - } - - .sm\:no-underline { - text-decoration: none !important; - } - - .sm\:antialiased { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .sm\:subpixel-antialiased { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .sm\:hover\:italic:hover { - font-style: italic !important; - } - - .sm\:hover\:roman:hover { - font-style: normal !important; - } - .sm\:hover\:uppercase:hover { text-transform: uppercase !important; } @@ -11364,36 +11350,6 @@ table { text-transform: none !important; } - .sm\:hover\:underline:hover { - text-decoration: underline !important; - } - - .sm\:hover\:line-through:hover { - text-decoration: line-through !important; - } - - .sm\:hover\:no-underline:hover { - text-decoration: none !important; - } - - .sm\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .sm\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .sm\:focus\:italic:focus { - font-style: italic !important; - } - - .sm\:focus\:roman:focus { - font-style: normal !important; - } - .sm\:focus\:uppercase:focus { text-transform: uppercase !important; } @@ -11410,6 +11366,30 @@ table { text-transform: none !important; } + .sm\:underline { + text-decoration: underline !important; + } + + .sm\:line-through { + text-decoration: line-through !important; + } + + .sm\:no-underline { + text-decoration: none !important; + } + + .sm\:hover\:underline:hover { + text-decoration: underline !important; + } + + .sm\:hover\:line-through:hover { + text-decoration: line-through !important; + } + + .sm\:hover\:no-underline:hover { + text-decoration: none !important; + } + .sm\:focus\:underline:focus { text-decoration: underline !important; } @@ -11422,6 +11402,26 @@ table { text-decoration: none !important; } + .sm\:antialiased { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .sm\:subpixel-antialiased { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + + .sm\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .sm\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + .sm\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased !important; -moz-osx-font-smoothing: grayscale !important; @@ -16872,6 +16872,22 @@ table { font-style: normal !important; } + .md\:hover\:italic:hover { + font-style: italic !important; + } + + .md\:hover\:roman:hover { + font-style: normal !important; + } + + .md\:focus\:italic:focus { + font-style: italic !important; + } + + .md\:focus\:roman:focus { + font-style: normal !important; + } + .md\:uppercase { text-transform: uppercase !important; } @@ -16888,36 +16904,6 @@ table { text-transform: none !important; } - .md\:underline { - text-decoration: underline !important; - } - - .md\:line-through { - text-decoration: line-through !important; - } - - .md\:no-underline { - text-decoration: none !important; - } - - .md\:antialiased { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .md\:subpixel-antialiased { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .md\:hover\:italic:hover { - font-style: italic !important; - } - - .md\:hover\:roman:hover { - font-style: normal !important; - } - .md\:hover\:uppercase:hover { text-transform: uppercase !important; } @@ -16934,36 +16920,6 @@ table { text-transform: none !important; } - .md\:hover\:underline:hover { - text-decoration: underline !important; - } - - .md\:hover\:line-through:hover { - text-decoration: line-through !important; - } - - .md\:hover\:no-underline:hover { - text-decoration: none !important; - } - - .md\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .md\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .md\:focus\:italic:focus { - font-style: italic !important; - } - - .md\:focus\:roman:focus { - font-style: normal !important; - } - .md\:focus\:uppercase:focus { text-transform: uppercase !important; } @@ -16980,6 +16936,30 @@ table { text-transform: none !important; } + .md\:underline { + text-decoration: underline !important; + } + + .md\:line-through { + text-decoration: line-through !important; + } + + .md\:no-underline { + text-decoration: none !important; + } + + .md\:hover\:underline:hover { + text-decoration: underline !important; + } + + .md\:hover\:line-through:hover { + text-decoration: line-through !important; + } + + .md\:hover\:no-underline:hover { + text-decoration: none !important; + } + .md\:focus\:underline:focus { text-decoration: underline !important; } @@ -16992,6 +16972,26 @@ table { text-decoration: none !important; } + .md\:antialiased { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .md\:subpixel-antialiased { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + + .md\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .md\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + .md\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased !important; -moz-osx-font-smoothing: grayscale !important; @@ -22442,6 +22442,22 @@ table { font-style: normal !important; } + .lg\:hover\:italic:hover { + font-style: italic !important; + } + + .lg\:hover\:roman:hover { + font-style: normal !important; + } + + .lg\:focus\:italic:focus { + font-style: italic !important; + } + + .lg\:focus\:roman:focus { + font-style: normal !important; + } + .lg\:uppercase { text-transform: uppercase !important; } @@ -22458,36 +22474,6 @@ table { text-transform: none !important; } - .lg\:underline { - text-decoration: underline !important; - } - - .lg\:line-through { - text-decoration: line-through !important; - } - - .lg\:no-underline { - text-decoration: none !important; - } - - .lg\:antialiased { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .lg\:subpixel-antialiased { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .lg\:hover\:italic:hover { - font-style: italic !important; - } - - .lg\:hover\:roman:hover { - font-style: normal !important; - } - .lg\:hover\:uppercase:hover { text-transform: uppercase !important; } @@ -22504,36 +22490,6 @@ table { text-transform: none !important; } - .lg\:hover\:underline:hover { - text-decoration: underline !important; - } - - .lg\:hover\:line-through:hover { - text-decoration: line-through !important; - } - - .lg\:hover\:no-underline:hover { - text-decoration: none !important; - } - - .lg\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .lg\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .lg\:focus\:italic:focus { - font-style: italic !important; - } - - .lg\:focus\:roman:focus { - font-style: normal !important; - } - .lg\:focus\:uppercase:focus { text-transform: uppercase !important; } @@ -22550,6 +22506,30 @@ table { text-transform: none !important; } + .lg\:underline { + text-decoration: underline !important; + } + + .lg\:line-through { + text-decoration: line-through !important; + } + + .lg\:no-underline { + text-decoration: none !important; + } + + .lg\:hover\:underline:hover { + text-decoration: underline !important; + } + + .lg\:hover\:line-through:hover { + text-decoration: line-through !important; + } + + .lg\:hover\:no-underline:hover { + text-decoration: none !important; + } + .lg\:focus\:underline:focus { text-decoration: underline !important; } @@ -22562,6 +22542,26 @@ table { text-decoration: none !important; } + .lg\:antialiased { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .lg\:subpixel-antialiased { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + + .lg\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .lg\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + .lg\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased !important; -moz-osx-font-smoothing: grayscale !important; @@ -28012,6 +28012,22 @@ table { font-style: normal !important; } + .xl\:hover\:italic:hover { + font-style: italic !important; + } + + .xl\:hover\:roman:hover { + font-style: normal !important; + } + + .xl\:focus\:italic:focus { + font-style: italic !important; + } + + .xl\:focus\:roman:focus { + font-style: normal !important; + } + .xl\:uppercase { text-transform: uppercase !important; } @@ -28028,36 +28044,6 @@ table { text-transform: none !important; } - .xl\:underline { - text-decoration: underline !important; - } - - .xl\:line-through { - text-decoration: line-through !important; - } - - .xl\:no-underline { - text-decoration: none !important; - } - - .xl\:antialiased { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .xl\:subpixel-antialiased { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .xl\:hover\:italic:hover { - font-style: italic !important; - } - - .xl\:hover\:roman:hover { - font-style: normal !important; - } - .xl\:hover\:uppercase:hover { text-transform: uppercase !important; } @@ -28074,36 +28060,6 @@ table { text-transform: none !important; } - .xl\:hover\:underline:hover { - text-decoration: underline !important; - } - - .xl\:hover\:line-through:hover { - text-decoration: line-through !important; - } - - .xl\:hover\:no-underline:hover { - text-decoration: none !important; - } - - .xl\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased !important; - -moz-osx-font-smoothing: grayscale !important; - } - - .xl\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto !important; - -moz-osx-font-smoothing: auto !important; - } - - .xl\:focus\:italic:focus { - font-style: italic !important; - } - - .xl\:focus\:roman:focus { - font-style: normal !important; - } - .xl\:focus\:uppercase:focus { text-transform: uppercase !important; } @@ -28120,6 +28076,30 @@ table { text-transform: none !important; } + .xl\:underline { + text-decoration: underline !important; + } + + .xl\:line-through { + text-decoration: line-through !important; + } + + .xl\:no-underline { + text-decoration: none !important; + } + + .xl\:hover\:underline:hover { + text-decoration: underline !important; + } + + .xl\:hover\:line-through:hover { + text-decoration: line-through !important; + } + + .xl\:hover\:no-underline:hover { + text-decoration: none !important; + } + .xl\:focus\:underline:focus { text-decoration: underline !important; } @@ -28132,6 +28112,26 @@ table { text-decoration: none !important; } + .xl\:antialiased { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .xl\:subpixel-antialiased { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + + .xl\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; + } + + .xl\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto !important; + -moz-osx-font-smoothing: auto !important; + } + .xl\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased !important; -moz-osx-font-smoothing: grayscale !important; diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 84d7075d8..16c475e17 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -5733,6 +5733,22 @@ table { font-style: normal; } +.hover\:italic:hover { + font-style: italic; +} + +.hover\:roman:hover { + font-style: normal; +} + +.focus\:italic:focus { + font-style: italic; +} + +.focus\:roman:focus { + font-style: normal; +} + .uppercase { text-transform: uppercase; } @@ -5749,36 +5765,6 @@ table { text-transform: none; } -.underline { - text-decoration: underline; -} - -.line-through { - text-decoration: line-through; -} - -.no-underline { - text-decoration: none; -} - -.antialiased { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.subpixel-antialiased { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; -} - -.hover\:italic:hover { - font-style: italic; -} - -.hover\:roman:hover { - font-style: normal; -} - .hover\:uppercase:hover { text-transform: uppercase; } @@ -5795,36 +5781,6 @@ table { text-transform: none; } -.hover\:underline:hover { - text-decoration: underline; -} - -.hover\:line-through:hover { - text-decoration: line-through; -} - -.hover\:no-underline:hover { - text-decoration: none; -} - -.hover\:antialiased:hover { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; -} - -.focus\:italic:focus { - font-style: italic; -} - -.focus\:roman:focus { - font-style: normal; -} - .focus\:uppercase:focus { text-transform: uppercase; } @@ -5841,6 +5797,30 @@ table { text-transform: none; } +.underline { + text-decoration: underline; +} + +.line-through { + text-decoration: line-through; +} + +.no-underline { + text-decoration: none; +} + +.hover\:underline:hover { + text-decoration: underline; +} + +.hover\:line-through:hover { + text-decoration: line-through; +} + +.hover\:no-underline:hover { + text-decoration: none; +} + .focus\:underline:focus { text-decoration: underline; } @@ -5853,6 +5833,26 @@ table { text-decoration: none; } +.antialiased { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.subpixel-antialiased { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; +} + +.hover\:antialiased:hover { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; +} + .focus\:antialiased:focus { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -11302,6 +11302,22 @@ table { font-style: normal; } + .sm\:hover\:italic:hover { + font-style: italic; + } + + .sm\:hover\:roman:hover { + font-style: normal; + } + + .sm\:focus\:italic:focus { + font-style: italic; + } + + .sm\:focus\:roman:focus { + font-style: normal; + } + .sm\:uppercase { text-transform: uppercase; } @@ -11318,36 +11334,6 @@ table { text-transform: none; } - .sm\:underline { - text-decoration: underline; - } - - .sm\:line-through { - text-decoration: line-through; - } - - .sm\:no-underline { - text-decoration: none; - } - - .sm\:antialiased { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .sm\:subpixel-antialiased { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .sm\:hover\:italic:hover { - font-style: italic; - } - - .sm\:hover\:roman:hover { - font-style: normal; - } - .sm\:hover\:uppercase:hover { text-transform: uppercase; } @@ -11364,36 +11350,6 @@ table { text-transform: none; } - .sm\:hover\:underline:hover { - text-decoration: underline; - } - - .sm\:hover\:line-through:hover { - text-decoration: line-through; - } - - .sm\:hover\:no-underline:hover { - text-decoration: none; - } - - .sm\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .sm\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .sm\:focus\:italic:focus { - font-style: italic; - } - - .sm\:focus\:roman:focus { - font-style: normal; - } - .sm\:focus\:uppercase:focus { text-transform: uppercase; } @@ -11410,6 +11366,30 @@ table { text-transform: none; } + .sm\:underline { + text-decoration: underline; + } + + .sm\:line-through { + text-decoration: line-through; + } + + .sm\:no-underline { + text-decoration: none; + } + + .sm\:hover\:underline:hover { + text-decoration: underline; + } + + .sm\:hover\:line-through:hover { + text-decoration: line-through; + } + + .sm\:hover\:no-underline:hover { + text-decoration: none; + } + .sm\:focus\:underline:focus { text-decoration: underline; } @@ -11422,6 +11402,26 @@ table { text-decoration: none; } + .sm\:antialiased { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .sm\:subpixel-antialiased { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + + .sm\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .sm\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + .sm\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -16872,6 +16872,22 @@ table { font-style: normal; } + .md\:hover\:italic:hover { + font-style: italic; + } + + .md\:hover\:roman:hover { + font-style: normal; + } + + .md\:focus\:italic:focus { + font-style: italic; + } + + .md\:focus\:roman:focus { + font-style: normal; + } + .md\:uppercase { text-transform: uppercase; } @@ -16888,36 +16904,6 @@ table { text-transform: none; } - .md\:underline { - text-decoration: underline; - } - - .md\:line-through { - text-decoration: line-through; - } - - .md\:no-underline { - text-decoration: none; - } - - .md\:antialiased { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .md\:subpixel-antialiased { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .md\:hover\:italic:hover { - font-style: italic; - } - - .md\:hover\:roman:hover { - font-style: normal; - } - .md\:hover\:uppercase:hover { text-transform: uppercase; } @@ -16934,36 +16920,6 @@ table { text-transform: none; } - .md\:hover\:underline:hover { - text-decoration: underline; - } - - .md\:hover\:line-through:hover { - text-decoration: line-through; - } - - .md\:hover\:no-underline:hover { - text-decoration: none; - } - - .md\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .md\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .md\:focus\:italic:focus { - font-style: italic; - } - - .md\:focus\:roman:focus { - font-style: normal; - } - .md\:focus\:uppercase:focus { text-transform: uppercase; } @@ -16980,6 +16936,30 @@ table { text-transform: none; } + .md\:underline { + text-decoration: underline; + } + + .md\:line-through { + text-decoration: line-through; + } + + .md\:no-underline { + text-decoration: none; + } + + .md\:hover\:underline:hover { + text-decoration: underline; + } + + .md\:hover\:line-through:hover { + text-decoration: line-through; + } + + .md\:hover\:no-underline:hover { + text-decoration: none; + } + .md\:focus\:underline:focus { text-decoration: underline; } @@ -16992,6 +16972,26 @@ table { text-decoration: none; } + .md\:antialiased { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .md\:subpixel-antialiased { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + + .md\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .md\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + .md\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -22442,6 +22442,22 @@ table { font-style: normal; } + .lg\:hover\:italic:hover { + font-style: italic; + } + + .lg\:hover\:roman:hover { + font-style: normal; + } + + .lg\:focus\:italic:focus { + font-style: italic; + } + + .lg\:focus\:roman:focus { + font-style: normal; + } + .lg\:uppercase { text-transform: uppercase; } @@ -22458,36 +22474,6 @@ table { text-transform: none; } - .lg\:underline { - text-decoration: underline; - } - - .lg\:line-through { - text-decoration: line-through; - } - - .lg\:no-underline { - text-decoration: none; - } - - .lg\:antialiased { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .lg\:subpixel-antialiased { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .lg\:hover\:italic:hover { - font-style: italic; - } - - .lg\:hover\:roman:hover { - font-style: normal; - } - .lg\:hover\:uppercase:hover { text-transform: uppercase; } @@ -22504,36 +22490,6 @@ table { text-transform: none; } - .lg\:hover\:underline:hover { - text-decoration: underline; - } - - .lg\:hover\:line-through:hover { - text-decoration: line-through; - } - - .lg\:hover\:no-underline:hover { - text-decoration: none; - } - - .lg\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .lg\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .lg\:focus\:italic:focus { - font-style: italic; - } - - .lg\:focus\:roman:focus { - font-style: normal; - } - .lg\:focus\:uppercase:focus { text-transform: uppercase; } @@ -22550,6 +22506,30 @@ table { text-transform: none; } + .lg\:underline { + text-decoration: underline; + } + + .lg\:line-through { + text-decoration: line-through; + } + + .lg\:no-underline { + text-decoration: none; + } + + .lg\:hover\:underline:hover { + text-decoration: underline; + } + + .lg\:hover\:line-through:hover { + text-decoration: line-through; + } + + .lg\:hover\:no-underline:hover { + text-decoration: none; + } + .lg\:focus\:underline:focus { text-decoration: underline; } @@ -22562,6 +22542,26 @@ table { text-decoration: none; } + .lg\:antialiased { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .lg\:subpixel-antialiased { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + + .lg\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .lg\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + .lg\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -28012,6 +28012,22 @@ table { font-style: normal; } + .xl\:hover\:italic:hover { + font-style: italic; + } + + .xl\:hover\:roman:hover { + font-style: normal; + } + + .xl\:focus\:italic:focus { + font-style: italic; + } + + .xl\:focus\:roman:focus { + font-style: normal; + } + .xl\:uppercase { text-transform: uppercase; } @@ -28028,36 +28044,6 @@ table { text-transform: none; } - .xl\:underline { - text-decoration: underline; - } - - .xl\:line-through { - text-decoration: line-through; - } - - .xl\:no-underline { - text-decoration: none; - } - - .xl\:antialiased { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .xl\:subpixel-antialiased { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .xl\:hover\:italic:hover { - font-style: italic; - } - - .xl\:hover\:roman:hover { - font-style: normal; - } - .xl\:hover\:uppercase:hover { text-transform: uppercase; } @@ -28074,36 +28060,6 @@ table { text-transform: none; } - .xl\:hover\:underline:hover { - text-decoration: underline; - } - - .xl\:hover\:line-through:hover { - text-decoration: line-through; - } - - .xl\:hover\:no-underline:hover { - text-decoration: none; - } - - .xl\:hover\:antialiased:hover { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - .xl\:hover\:subpixel-antialiased:hover { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; - } - - .xl\:focus\:italic:focus { - font-style: italic; - } - - .xl\:focus\:roman:focus { - font-style: normal; - } - .xl\:focus\:uppercase:focus { text-transform: uppercase; } @@ -28120,6 +28076,30 @@ table { text-transform: none; } + .xl\:underline { + text-decoration: underline; + } + + .xl\:line-through { + text-decoration: line-through; + } + + .xl\:no-underline { + text-decoration: none; + } + + .xl\:hover\:underline:hover { + text-decoration: underline; + } + + .xl\:hover\:line-through:hover { + text-decoration: line-through; + } + + .xl\:hover\:no-underline:hover { + text-decoration: none; + } + .xl\:focus\:underline:focus { text-decoration: underline; } @@ -28132,6 +28112,26 @@ table { text-decoration: none; } + .xl\:antialiased { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .xl\:subpixel-antialiased { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + + .xl\:hover\:antialiased:hover { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .xl\:hover\:subpixel-antialiased:hover { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + } + .xl\:focus\:antialiased:focus { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 171621924..b8faf69c5 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -48,7 +48,10 @@ module.exports = { textAlign: ['responsive'], textColor: ['responsive', 'hover', 'focus'], fontSize: ['responsive'], - textStyle: ['responsive', 'hover', 'focus'], + fontStyle: ['responsive', 'hover', 'focus'], + textTransform: ['responsive', 'hover', 'focus'], + textDecoration: ['responsive', 'hover', 'focus'], + fontSmoothing: ['responsive', 'hover', 'focus'], letterSpacing: ['responsive'], userSelect: ['responsive'], verticalAlign: ['responsive'], diff --git a/plugins/fontSmoothing.js b/plugins/fontSmoothing.js new file mode 100644 index 000000000..1ab5cdac3 --- /dev/null +++ b/plugins/fontSmoothing.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/fontSmoothing').default diff --git a/plugins/fontStyle.js b/plugins/fontStyle.js new file mode 100644 index 000000000..2f9965c50 --- /dev/null +++ b/plugins/fontStyle.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/fontStyle').default diff --git a/plugins/textDecoration.js b/plugins/textDecoration.js new file mode 100644 index 000000000..34531f72b --- /dev/null +++ b/plugins/textDecoration.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/textDecoration').default diff --git a/plugins/textStyle.js b/plugins/textStyle.js deleted file mode 100644 index b6c28b6cf..000000000 --- a/plugins/textStyle.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/textStyle').default diff --git a/plugins/textTransform.js b/plugins/textTransform.js new file mode 100644 index 000000000..83d065eee --- /dev/null +++ b/plugins/textTransform.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/textTransform').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 221e506a4..c0d7f8ebf 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -41,7 +41,10 @@ import tableLayout from './plugins/tableLayout' import textAlign from './plugins/textAlign' import textColor from './plugins/textColor' import fontSize from './plugins/fontSize' -import textStyle from './plugins/textStyle' +import fontStyle from './plugins/fontStyle' +import textTransform from './plugins/textTransform' +import textDecoration from './plugins/textDecoration' +import fontSmoothing from './plugins/fontSmoothing' import letterSpacing from './plugins/letterSpacing' import userSelect from './plugins/userSelect' import verticalAlign from './plugins/verticalAlign' @@ -112,7 +115,10 @@ export default function(config) { textAlign, textColor, fontSize, - textStyle, + fontStyle, + textTransform, + textDecoration, + fontSmoothing, letterSpacing, userSelect, verticalAlign, diff --git a/src/plugins/fontSmoothing.js b/src/plugins/fontSmoothing.js new file mode 100644 index 000000000..d34fc6e8e --- /dev/null +++ b/src/plugins/fontSmoothing.js @@ -0,0 +1,17 @@ +export default function({ variants }) { + return function({ addUtilities }) { + addUtilities( + { + '.antialiased': { + '-webkit-font-smoothing': 'antialiased', + '-moz-osx-font-smoothing': 'grayscale', + }, + '.subpixel-antialiased': { + '-webkit-font-smoothing': 'auto', + '-moz-osx-font-smoothing': 'auto', + }, + }, + variants + ) + } +} diff --git a/src/plugins/fontStyle.js b/src/plugins/fontStyle.js new file mode 100644 index 000000000..760b040c8 --- /dev/null +++ b/src/plugins/fontStyle.js @@ -0,0 +1,11 @@ +export default function({ variants }) { + return function({ addUtilities }) { + addUtilities( + { + '.italic': { 'font-style': 'italic' }, + '.roman': { 'font-style': 'normal' }, + }, + variants + ) + } +} diff --git a/src/plugins/textDecoration.js b/src/plugins/textDecoration.js new file mode 100644 index 000000000..5217fd026 --- /dev/null +++ b/src/plugins/textDecoration.js @@ -0,0 +1,12 @@ +export default function({ variants }) { + return function({ addUtilities }) { + addUtilities( + { + '.underline': { 'text-decoration': 'underline' }, + '.line-through': { 'text-decoration': 'line-through' }, + '.no-underline': { 'text-decoration': 'none' }, + }, + variants + ) + } +} diff --git a/src/plugins/textStyle.js b/src/plugins/textStyle.js deleted file mode 100644 index a632d9145..000000000 --- a/src/plugins/textStyle.js +++ /dev/null @@ -1,29 +0,0 @@ -export default function({ variants }) { - return function({ addUtilities }) { - addUtilities( - { - '.italic': { 'font-style': 'italic' }, - '.roman': { 'font-style': 'normal' }, - - '.uppercase': { 'text-transform': 'uppercase' }, - '.lowercase': { 'text-transform': 'lowercase' }, - '.capitalize': { 'text-transform': 'capitalize' }, - '.normal-case': { 'text-transform': 'none' }, - - '.underline': { 'text-decoration': 'underline' }, - '.line-through': { 'text-decoration': 'line-through' }, - '.no-underline': { 'text-decoration': 'none' }, - - '.antialiased': { - '-webkit-font-smoothing': 'antialiased', - '-moz-osx-font-smoothing': 'grayscale', - }, - '.subpixel-antialiased': { - '-webkit-font-smoothing': 'auto', - '-moz-osx-font-smoothing': 'auto', - }, - }, - variants - ) - } -} diff --git a/src/plugins/textTransform.js b/src/plugins/textTransform.js new file mode 100644 index 000000000..8e5ed8439 --- /dev/null +++ b/src/plugins/textTransform.js @@ -0,0 +1,13 @@ +export default function({ variants }) { + return function({ addUtilities }) { + addUtilities( + { + '.uppercase': { 'text-transform': 'uppercase' }, + '.lowercase': { 'text-transform': 'lowercase' }, + '.capitalize': { 'text-transform': 'capitalize' }, + '.normal-case': { 'text-transform': 'none' }, + }, + variants + ) + } +} From 914c581974295c5d2b5ee6e60c0663f797d666b4 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 22:07:37 -0500 Subject: [PATCH 16/17] Revert renaming tracking to letterSpacing --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/letterSpacing.js | 1 - plugins/tracking.js | 1 + src/corePlugins.js | 4 ++-- src/plugins/{letterSpacing.js => tracking.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 plugins/letterSpacing.js create mode 100644 plugins/tracking.js rename src/plugins/{letterSpacing.js => tracking.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index b8faf69c5..992c8750c 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -52,7 +52,7 @@ module.exports = { textTransform: ['responsive', 'hover', 'focus'], textDecoration: ['responsive', 'hover', 'focus'], fontSmoothing: ['responsive', 'hover', 'focus'], - letterSpacing: ['responsive'], + tracking: ['responsive'], userSelect: ['responsive'], verticalAlign: ['responsive'], visibility: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index a0571d2f8..3102f5c93 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -148,7 +148,7 @@ module.exports = function() { normal: 1.5, loose: 2, }, - letterSpacing: { + tracking: { tight: '-0.05em', normal: '0', wide: '0.05em', diff --git a/plugins/letterSpacing.js b/plugins/letterSpacing.js deleted file mode 100644 index 20be9ee84..000000000 --- a/plugins/letterSpacing.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/letterSpacing').default diff --git a/plugins/tracking.js b/plugins/tracking.js new file mode 100644 index 000000000..1e44f581c --- /dev/null +++ b/plugins/tracking.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/tracking').default diff --git a/src/corePlugins.js b/src/corePlugins.js index c0d7f8ebf..291f72a5d 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -45,7 +45,7 @@ import fontStyle from './plugins/fontStyle' import textTransform from './plugins/textTransform' import textDecoration from './plugins/textDecoration' import fontSmoothing from './plugins/fontSmoothing' -import letterSpacing from './plugins/letterSpacing' +import tracking from './plugins/tracking' import userSelect from './plugins/userSelect' import verticalAlign from './plugins/verticalAlign' import visibility from './plugins/visibility' @@ -119,7 +119,7 @@ export default function(config) { textTransform, textDecoration, fontSmoothing, - letterSpacing, + tracking, userSelect, verticalAlign, visibility, diff --git a/src/plugins/letterSpacing.js b/src/plugins/tracking.js similarity index 100% rename from src/plugins/letterSpacing.js rename to src/plugins/tracking.js From 3e468dd59d451ec82dc275b72987310a9ae94fc3 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 15 Feb 2019 22:08:58 -0500 Subject: [PATCH 17/17] Revert renaming leading to lineHeight --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/leading.js | 1 + plugins/lineHeight.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{lineHeight.js => leading.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/leading.js delete mode 100644 plugins/lineHeight.js rename src/plugins/{lineHeight.js => leading.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 992c8750c..8715bf9ea 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -24,7 +24,7 @@ module.exports = { fontFamily: ['responsive'], fontWeight: ['responsive', 'hover', 'focus'], height: ['responsive'], - lineHeight: ['responsive'], + leading: ['responsive'], listStyle: ['responsive'], margin: ['responsive'], maxHeight: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 3102f5c93..cf6304099 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -142,7 +142,7 @@ module.exports = function() { extrabold: 800, black: 900, }, - lineHeight: { + leading: { none: 1, tight: 1.25, normal: 1.5, diff --git a/plugins/leading.js b/plugins/leading.js new file mode 100644 index 000000000..231aeb9ed --- /dev/null +++ b/plugins/leading.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/leading').default diff --git a/plugins/lineHeight.js b/plugins/lineHeight.js deleted file mode 100644 index 31977ffaa..000000000 --- a/plugins/lineHeight.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/lineHeight').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 291f72a5d..ba2443042 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -18,7 +18,7 @@ import float from './plugins/float' import fontFamily from './plugins/fontFamily' import fontWeight from './plugins/fontWeight' import height from './plugins/height' -import lineHeight from './plugins/lineHeight' +import leading from './plugins/leading' import margin from './plugins/margin' import maxHeight from './plugins/maxHeight' import maxWidth from './plugins/maxWidth' @@ -92,7 +92,7 @@ export default function(config) { fontFamily, fontWeight, height, - lineHeight, + leading, margin, maxHeight, maxWidth, diff --git a/src/plugins/lineHeight.js b/src/plugins/leading.js similarity index 100% rename from src/plugins/lineHeight.js rename to src/plugins/leading.js