Move default border color back to preflight

tailwindlabs · Jan 7, 2022 · f1f6ea2 · f1f6ea2
1 parent c2ee08c
commit f1f6ea2
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 50 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: ;