diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index a67f1b1c8..4368380aa 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -1060,14 +1060,14 @@ video { .divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))) !important; - border-bottom-width: calc(0 * var(--divide-y-reverse)) !important; + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(0px * var(--divide-y-reverse)) !important; } .divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right-width: calc(0 * var(--divide-x-reverse)) !important; - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))) !important; + border-right-width: calc(0px * var(--divide-x-reverse)) !important; + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))) !important; } .divide-y-2 > :not(template) ~ :not(template) { @@ -12349,14 +12349,14 @@ video { .sm\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))) !important; - border-bottom-width: calc(0 * var(--divide-y-reverse)) !important; + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(0px * var(--divide-y-reverse)) !important; } .sm\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right-width: calc(0 * var(--divide-x-reverse)) !important; - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))) !important; + border-right-width: calc(0px * var(--divide-x-reverse)) !important; + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))) !important; } .sm\:divide-y-2 > :not(template) ~ :not(template) { @@ -23639,14 +23639,14 @@ video { .md\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))) !important; - border-bottom-width: calc(0 * var(--divide-y-reverse)) !important; + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(0px * var(--divide-y-reverse)) !important; } .md\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right-width: calc(0 * var(--divide-x-reverse)) !important; - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))) !important; + border-right-width: calc(0px * var(--divide-x-reverse)) !important; + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))) !important; } .md\:divide-y-2 > :not(template) ~ :not(template) { @@ -34929,14 +34929,14 @@ video { .lg\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))) !important; - border-bottom-width: calc(0 * var(--divide-y-reverse)) !important; + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(0px * var(--divide-y-reverse)) !important; } .lg\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right-width: calc(0 * var(--divide-x-reverse)) !important; - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))) !important; + border-right-width: calc(0px * var(--divide-x-reverse)) !important; + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))) !important; } .lg\:divide-y-2 > :not(template) ~ :not(template) { @@ -46219,14 +46219,14 @@ video { .xl\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0 !important; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))) !important; - border-bottom-width: calc(0 * var(--divide-y-reverse)) !important; + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))) !important; + border-bottom-width: calc(0px * var(--divide-y-reverse)) !important; } .xl\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0 !important; - border-right-width: calc(0 * var(--divide-x-reverse)) !important; - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))) !important; + border-right-width: calc(0px * var(--divide-x-reverse)) !important; + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))) !important; } .xl\:divide-y-2 > :not(template) ~ :not(template) { diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 6673592d9..58fb7bcb1 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -1060,14 +1060,14 @@ video { .divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))); - border-bottom-width: calc(0 * var(--divide-y-reverse)); + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(0px * var(--divide-y-reverse)); } .divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right-width: calc(0 * var(--divide-x-reverse)); - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))); + border-right-width: calc(0px * var(--divide-x-reverse)); + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))); } .divide-y-2 > :not(template) ~ :not(template) { @@ -12349,14 +12349,14 @@ video { .sm\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))); - border-bottom-width: calc(0 * var(--divide-y-reverse)); + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(0px * var(--divide-y-reverse)); } .sm\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right-width: calc(0 * var(--divide-x-reverse)); - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))); + border-right-width: calc(0px * var(--divide-x-reverse)); + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))); } .sm\:divide-y-2 > :not(template) ~ :not(template) { @@ -23639,14 +23639,14 @@ video { .md\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))); - border-bottom-width: calc(0 * var(--divide-y-reverse)); + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(0px * var(--divide-y-reverse)); } .md\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right-width: calc(0 * var(--divide-x-reverse)); - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))); + border-right-width: calc(0px * var(--divide-x-reverse)); + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))); } .md\:divide-y-2 > :not(template) ~ :not(template) { @@ -34929,14 +34929,14 @@ video { .lg\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))); - border-bottom-width: calc(0 * var(--divide-y-reverse)); + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(0px * var(--divide-y-reverse)); } .lg\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right-width: calc(0 * var(--divide-x-reverse)); - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))); + border-right-width: calc(0px * var(--divide-x-reverse)); + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))); } .lg\:divide-y-2 > :not(template) ~ :not(template) { @@ -46219,14 +46219,14 @@ video { .xl\:divide-y-0 > :not(template) ~ :not(template) { --divide-y-reverse: 0; - border-top-width: calc(0 * calc(1 - var(--divide-y-reverse))); - border-bottom-width: calc(0 * var(--divide-y-reverse)); + border-top-width: calc(0px * calc(1 - var(--divide-y-reverse))); + border-bottom-width: calc(0px * var(--divide-y-reverse)); } .xl\:divide-x-0 > :not(template) ~ :not(template) { --divide-x-reverse: 0; - border-right-width: calc(0 * var(--divide-x-reverse)); - border-left-width: calc(0 * calc(1 - var(--divide-x-reverse))); + border-right-width: calc(0px * var(--divide-x-reverse)); + border-left-width: calc(0px * calc(1 - var(--divide-x-reverse))); } .xl\:divide-y-2 > :not(template) ~ :not(template) { diff --git a/__tests__/plugins/divideWidth.test.js b/__tests__/plugins/divideWidth.test.js index 2c99d779f..b55558a69 100644 --- a/__tests__/plugins/divideWidth.test.js +++ b/__tests__/plugins/divideWidth.test.js @@ -6,6 +6,7 @@ test('generating divide width utilities', () => { theme: { divideWidth: { default: '1px', + '0': '0', '2': '2px', '4': '4px', }, @@ -30,6 +31,16 @@ test('generating divide width utilities', () => { 'border-right-width': 'calc(1px * var(--divide-x-reverse))', 'border-left-width': 'calc(1px * calc(1 - var(--divide-x-reverse)))', }, + '.divide-y-0 > :not(template) ~ :not(template)': { + '--divide-y-reverse': '0', + 'border-top-width': 'calc(0px * calc(1 - var(--divide-y-reverse)))', + 'border-bottom-width': 'calc(0px * var(--divide-y-reverse))', + }, + '.divide-x-0 > :not(template) ~ :not(template)': { + '--divide-x-reverse': '0', + 'border-right-width': 'calc(0px * var(--divide-x-reverse))', + 'border-left-width': 'calc(0px * calc(1 - var(--divide-x-reverse)))', + }, '.divide-y-2 > :not(template) ~ :not(template)': { '--divide-y-reverse': '0', 'border-top-width': 'calc(2px * calc(1 - var(--divide-y-reverse)))', diff --git a/src/plugins/divideWidth.js b/src/plugins/divideWidth.js index 62aa5455b..44757d8e2 100644 --- a/src/plugins/divideWidth.js +++ b/src/plugins/divideWidth.js @@ -6,13 +6,17 @@ export default function() { (size, modifier) => ({ [`.${e(`divide-y${modifier}`)} > :not(template) ~ :not(template)`]: { '--divide-y-reverse': '0', - 'border-top-width': `calc(${size} * calc(1 - var(--divide-y-reverse)))`, - 'border-bottom-width': `calc(${size} * var(--divide-y-reverse))`, + 'border-top-width': `calc(${ + size === '0' ? '0px' : size + } * calc(1 - var(--divide-y-reverse)))`, + 'border-bottom-width': `calc(${size === '0' ? '0px' : size} * var(--divide-y-reverse))`, }, [`.${e(`divide-x${modifier}`)} > :not(template) ~ :not(template)`]: { '--divide-x-reverse': '0', - 'border-right-width': `calc(${size} * var(--divide-x-reverse))`, - 'border-left-width': `calc(${size} * calc(1 - var(--divide-x-reverse)))`, + 'border-right-width': `calc(${size === '0' ? '0px' : size} * var(--divide-x-reverse))`, + 'border-left-width': `calc(${ + size === '0' ? '0px' : size + } * calc(1 - var(--divide-x-reverse)))`, }, }), ]