From f1f6ea2d490f48824cd2e18a6acc078c0a5d907b Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Fri, 7 Jan 2022 10:28:29 -0500 Subject: [PATCH] Move default border color back to preflight --- src/corePlugins.js | 8 +------- src/css/preflight.css | 2 +- tests/apply.test.js | 6 ------ tests/basic-usage.test.css | 1 - tests/collapse-adjacent-rules.test.css | 1 - tests/experimental.test.js | 12 ------------ tests/import-syntax.test.css | 1 - tests/important-boolean.test.css | 1 - tests/important-modifier-prefix.test.css | 1 - tests/important-modifier.test.css | 1 - tests/important-selector.test.css | 1 - tests/kitchen-sink.test.css | 1 - tests/plugins/divide.test.js | 5 ----- tests/prefix.test.css | 1 - tests/resolve-defaults-at-rules.test.js | 6 ------ tests/util/defaults.js | 3 --- tests/variants.test.css | 1 - 17 files changed, 2 insertions(+), 50 deletions(-) diff --git a/src/corePlugins.js b/src/corePlugins.js index b575fdcabb77..b5e34c32c73e 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -1179,13 +1179,7 @@ export let corePlugins = { }) }, - borderColor: ({ addDefaults, matchUtilities, theme, corePlugins }) => { - let value = theme('borderColor.DEFAULT', 'currentColor') - - addDefaults('border-width', { - 'border-color': toColorValue(value), - }) - + borderColor: ({ matchUtilities, theme, corePlugins }) => { matchUtilities( { border: (value) => { diff --git a/src/css/preflight.css b/src/css/preflight.css index e39110866301..c15a3f2da831 100644 --- a/src/css/preflight.css +++ b/src/css/preflight.css @@ -9,7 +9,7 @@ box-sizing: border-box; /* 1 */ border-width: 0; /* 2 */ border-style: solid; /* 2 */ - border-color: currentColor; /* 2 */ + border-color: theme('borderColor.DEFAULT', 'currentColor'); /* 2 */ } ::before, diff --git a/tests/apply.test.js b/tests/apply.test.js index 16b476363358..afe5f13d884f 100644 --- a/tests/apply.test.js +++ b/tests/apply.test.js @@ -640,12 +640,6 @@ it('rules with vendor prefixes are still separate when optimizing defaults rules return run(input, config).then((result) => { return expect(result.css).toMatchFormattedCss(css` - [type='range']::-moz-range-thumb { - border-color: #e5e7eb; - } - .border { - border-color: #e5e7eb; - } input[type='range']::-moz-range-thumb { border-width: 1px; } diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css index 61202aa24a3e..0059eece2206 100644 --- a/tests/basic-usage.test.css +++ b/tests/basic-usage.test.css @@ -12,7 +12,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/collapse-adjacent-rules.test.css b/tests/collapse-adjacent-rules.test.css index fcef56b3bc29..2481c3dd7a42 100644 --- a/tests/collapse-adjacent-rules.test.css +++ b/tests/collapse-adjacent-rules.test.css @@ -21,7 +21,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/experimental.test.js b/tests/experimental.test.js index 278b18102f20..655bb84f8cd0 100644 --- a/tests/experimental.test.js +++ b/tests/experimental.test.js @@ -122,10 +122,6 @@ test('experimental universal selector improvements (child selectors: divide-y)', return run(input, config).then((result) => { expect(result.css).toMatchCss(css` - .divide-y > * { - border-color: #e5e7eb; - } - .resize { resize: both; } @@ -153,10 +149,6 @@ test('experimental universal selector improvements (hover:divide-y)', () => { return run(input, config).then((result) => { expect(result.css).toMatchCss(css` - .hover\:divide-y > * { - border-color: #e5e7eb; - } - .resize { resize: both; } @@ -185,10 +177,6 @@ test('experimental universal selector improvements (#app important)', () => { return run(input, config).then((result) => { expect(result.css).toMatchCss(css` - .divide-y > * { - border-color: #e5e7eb; - } - .shadow { --tw-ring-offset-shadow: 0 0 #0000; --tw-ring-shadow: 0 0 #0000; diff --git a/tests/import-syntax.test.css b/tests/import-syntax.test.css index 46f508083a2c..7c690fded0d0 100644 --- a/tests/import-syntax.test.css +++ b/tests/import-syntax.test.css @@ -15,7 +15,6 @@ h1 { --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/important-boolean.test.css b/tests/important-boolean.test.css index 9ce2b02e16ca..ed4b99df5f71 100644 --- a/tests/important-boolean.test.css +++ b/tests/important-boolean.test.css @@ -12,7 +12,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/important-modifier-prefix.test.css b/tests/important-modifier-prefix.test.css index dc44184de9ab..0cb8249fb5a8 100644 --- a/tests/important-modifier-prefix.test.css +++ b/tests/important-modifier-prefix.test.css @@ -12,7 +12,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/important-modifier.test.css b/tests/important-modifier.test.css index 116ec8f293f1..ab770caefd66 100644 --- a/tests/important-modifier.test.css +++ b/tests/important-modifier.test.css @@ -12,7 +12,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/important-selector.test.css b/tests/important-selector.test.css index c00ea921246e..7bfef7e66dad 100644 --- a/tests/important-selector.test.css +++ b/tests/important-selector.test.css @@ -12,7 +12,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/kitchen-sink.test.css b/tests/kitchen-sink.test.css index ca59df30917d..024106246f46 100644 --- a/tests/kitchen-sink.test.css +++ b/tests/kitchen-sink.test.css @@ -150,7 +150,6 @@ div { --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/plugins/divide.test.js b/tests/plugins/divide.test.js index 785d6ee7d29a..08ad34146f52 100644 --- a/tests/plugins/divide.test.js +++ b/tests/plugins/divide.test.js @@ -22,7 +22,6 @@ it('should add the divide styles for divide-y and a default border color', () => --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; @@ -87,7 +86,6 @@ it('should add the divide styles for divide-x and a default border color', () => --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; @@ -152,7 +150,6 @@ it('should add the divide styles for divide-y-reverse and a default border color --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; @@ -215,7 +212,6 @@ it('should add the divide styles for divide-x-reverse and a default border color --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; @@ -278,7 +274,6 @@ it('should only inject the base styles once if we use divide and border at the s --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/prefix.test.css b/tests/prefix.test.css index 190a565285d3..b2a66f6fe05f 100644 --- a/tests/prefix.test.css +++ b/tests/prefix.test.css @@ -12,7 +12,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/resolve-defaults-at-rules.test.js b/tests/resolve-defaults-at-rules.test.js index 4452f6689dbf..6adf398059d9 100644 --- a/tests/resolve-defaults-at-rules.test.js +++ b/tests/resolve-defaults-at-rules.test.js @@ -507,12 +507,6 @@ test('with borders', async () => { return run(input, config).then((result) => { expect(result.css).toMatchFormattedCss(css` - *, - ::before, - ::after { - border-color: #e5e7eb; - } - /* --- */ .border { border-width: 1px; diff --git a/tests/util/defaults.js b/tests/util/defaults.js index 7a0317e74240..e3a4dac69a92 100644 --- a/tests/util/defaults.js +++ b/tests/util/defaults.js @@ -2,12 +2,10 @@ import { css } from './strings' /** * @param {object} param0 - * @param {string} [param0.defaultBorderColor] * @param {string} [param0.defaultRingColor] * @returns {string} */ export function defaults({ - defaultBorderColor = `#e5e7eb`, defaultRingColor = `rgb(59 130 246 / 0.5)`, } = {}) { return css` @@ -25,7 +23,6 @@ export function defaults({ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: ${defaultBorderColor}; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; diff --git a/tests/variants.test.css b/tests/variants.test.css index e7cf6b04d3ae..f0a57328ab75 100644 --- a/tests/variants.test.css +++ b/tests/variants.test.css @@ -12,7 +12,6 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; - border-color: #e5e7eb; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ;