From 6e2088098716b8bb9e1a1004da72593eefa1308c Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Wed, 21 Oct 2020 10:03:54 -0400 Subject: [PATCH] Use [hidden] instead of template in space/divide utilities --- src/plugins/divideColor.js | 2 +- src/plugins/divideOpacity.js | 2 +- src/plugins/divideStyle.js | 10 +++++----- src/plugins/divideWidth.js | 8 ++++---- src/plugins/space.js | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/plugins/divideColor.js b/src/plugins/divideColor.js index c4a725e20..259b045ff 100644 --- a/src/plugins/divideColor.js +++ b/src/plugins/divideColor.js @@ -23,7 +23,7 @@ export default function () { const utilities = _.fromPairs( _.map(_.omit(colors, 'DEFAULT'), (value, modifier) => { return [ - `${nameClass('divide', modifier)} > :not(template) ~ :not(template)`, + `${nameClass('divide', modifier)} > :not([hidden]) ~ :not([hidden])`, getProperties(value), ] }) diff --git a/src/plugins/divideOpacity.js b/src/plugins/divideOpacity.js index 4c38865a8..47c744eec 100644 --- a/src/plugins/divideOpacity.js +++ b/src/plugins/divideOpacity.js @@ -6,7 +6,7 @@ export default function () { const utilities = _.fromPairs( _.map(theme('divideOpacity'), (value, modifier) => { return [ - `${nameClass('divide-opacity', modifier)} > :not(template) ~ :not(template)`, + `${nameClass('divide-opacity', modifier)} > :not([hidden]) ~ :not([hidden])`, { '--divide-opacity': value, }, diff --git a/src/plugins/divideStyle.js b/src/plugins/divideStyle.js index d87314c6e..3c3dae155 100644 --- a/src/plugins/divideStyle.js +++ b/src/plugins/divideStyle.js @@ -2,19 +2,19 @@ export default function () { return function ({ addUtilities, variants }) { addUtilities( { - '.divide-solid > :not(template) ~ :not(template)': { + '.divide-solid > :not([hidden]) ~ :not([hidden])': { 'border-style': 'solid', }, - '.divide-dashed > :not(template) ~ :not(template)': { + '.divide-dashed > :not([hidden]) ~ :not([hidden])': { 'border-style': 'dashed', }, - '.divide-dotted > :not(template) ~ :not(template)': { + '.divide-dotted > :not([hidden]) ~ :not([hidden])': { 'border-style': 'dotted', }, - '.divide-double > :not(template) ~ :not(template)': { + '.divide-double > :not([hidden]) ~ :not([hidden])': { 'border-style': 'double', }, - '.divide-none > :not(template) ~ :not(template)': { + '.divide-none > :not([hidden]) ~ :not([hidden])': { 'border-style': 'none', }, }, diff --git a/src/plugins/divideWidth.js b/src/plugins/divideWidth.js index e5e177188..ba9a4ee71 100644 --- a/src/plugins/divideWidth.js +++ b/src/plugins/divideWidth.js @@ -7,12 +7,12 @@ export default function () { (_size, modifier) => { const size = _size === '0' ? '0px' : _size return { - [`${nameClass('divide-y', modifier)} > :not(template) ~ :not(template)`]: { + [`${nameClass('divide-y', modifier)} > :not([hidden]) ~ :not([hidden])`]: { '--divide-y-reverse': '0', 'border-top-width': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, 'border-bottom-width': `calc(${size} * var(--divide-y-reverse))`, }, - [`${nameClass('divide-x', modifier)} > :not(template) ~ :not(template)`]: { + [`${nameClass('divide-x', modifier)} > :not([hidden]) ~ :not([hidden])`]: { '--divide-x-reverse': '0', 'border-inline-end-width': `calc(${size} * var(--divide-x-reverse))`, 'border-inline-start-width': `calc(${size} * calc(1 - var(--divide-x-reverse)))`, @@ -27,10 +27,10 @@ export default function () { return generator(value, modifier) }), { - '.divide-y-reverse > :not(template) ~ :not(template)': { + '.divide-y-reverse > :not([hidden]) ~ :not([hidden])': { '--divide-y-reverse': '1', }, - '.divide-x-reverse > :not(template) ~ :not(template)': { + '.divide-x-reverse > :not([hidden]) ~ :not([hidden])': { '--divide-x-reverse': '1', }, }, diff --git a/src/plugins/space.js b/src/plugins/space.js index 9c3053888..38cedba00 100644 --- a/src/plugins/space.js +++ b/src/plugins/space.js @@ -7,12 +7,12 @@ export default function () { (_size, modifier) => { const size = _size === '0' ? '0px' : _size return { - [`${nameClass('space-y', modifier)} > :not(template) ~ :not(template)`]: { + [`${nameClass('space-y', modifier)} > :not([hidden]) ~ :not([hidden])`]: { '--space-y-reverse': '0', 'margin-top': `calc(${size} * calc(1 - var(--space-y-reverse)))`, 'margin-bottom': `calc(${size} * var(--space-y-reverse))`, }, - [`${nameClass('space-x', modifier)} > :not(template) ~ :not(template)`]: { + [`${nameClass('space-x', modifier)} > :not([hidden]) ~ :not([hidden])`]: { '--space-x-reverse': '0', 'margin-inline-end': `calc(${size} * var(--space-x-reverse))`, 'margin-inline-start': `calc(${size} * calc(1 - var(--space-x-reverse)))`, @@ -25,10 +25,10 @@ export default function () { return [ ..._.flatMap(theme('space'), generator), { - '.space-y-reverse > :not(template) ~ :not(template)': { + '.space-y-reverse > :not([hidden]) ~ :not([hidden])': { '--space-y-reverse': '1', }, - '.space-x-reverse > :not(template) ~ :not(template)': { + '.space-x-reverse > :not([hidden]) ~ :not([hidden])': { '--space-x-reverse': '1', }, },