Tweak order of outline plugins

Co-Authored-By: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
tailwindlabs · Oct 26, 2021 · 1d4dcc6 · 1d4dcc6
1 parent 3999253
commit 1d4dcc6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/src/corePlugins.js b/src/corePlugins.js
@@ -1790,6 +1790,14 @@ export let corePlugins = {
     }
   })(),
 
+  outlineWidth: createUtilityPlugin('outlineWidth', [['outline', ['outline-width']]], {
+    type: ['length', 'number', 'percentage'],
+  }),
+
+  outlineOffset: createUtilityPlugin('outlineOffset', [['outline-offset', ['outline-offset']]], {
+    type: ['length', 'number', 'percentage'],
+  }),
+
   outlineStyle: ({ addUtilities }) => {
     addUtilities({
       '.outline': { 'outline-style': 'solid' },
@@ -1812,14 +1820,6 @@ export let corePlugins = {
     )
   },
 
-  outlineWidth: createUtilityPlugin('outlineWidth', [['outline', ['outline-width']]], {
-    type: ['length', 'number', 'percentage'],
-  }),
-
-  outlineOffset: createUtilityPlugin('outlineOffset', [['outline-offset', ['outline-offset']]], {
-    type: ['length', 'number', 'percentage'],
-  }),
-
   ringWidth: ({ matchUtilities, addBase, addUtilities, theme }) => {
     let ringOpacityDefault = theme('ringOpacity.DEFAULT', '0.5')
     let ringColorDefault = withAlphaValue(

diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js
@@ -701,14 +701,14 @@ module.exports = {
     placeholderColor: ({ theme }) => theme('colors'),
     placeholderOpacity: ({ theme }) => theme('opacity'),
     outlineColor: ({ theme }) => theme('colors'),
-    outlineWidth: {
+    outlineOffset: {
       0: '0px',
       1: '1px',
       2: '2px',
       4: '4px',
       8: '8px',
     },
-    outlineOffset: {
+    outlineWidth: {
       0: '0px',
       1: '1px',
       2: '2px',

diff --git a/tests/arbitrary-values.test.css b/tests/arbitrary-values.test.css
@@ -859,12 +859,6 @@
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
     var(--tw-shadow);
 }
-.outline-\[black\] {
-  outline-color: black;
-}
-.outline-\[color\:var\(--outline\)\] {
-  outline-color: var(--outline);
-}
 .outline-\[10px\] {
   outline-width: 10px;
 }
@@ -874,6 +868,12 @@
 .outline-offset-\[10px\] {
   outline-offset: 10px;
 }
+.outline-\[black\] {
+  outline-color: black;
+}
+.outline-\[color\:var\(--outline\)\] {
+  outline-color: var(--outline);
+}
 .ring-\[10px\] {
   --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width)
     var(--tw-ring-offset-color);

diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css
@@ -821,6 +821,12 @@
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
     var(--tw-shadow);
 }
+.outline-4 {
+  outline-width: 4px;
+}
+.outline-offset-2 {
+  outline-offset: 2px;
+}
 .outline {
   outline-style: solid;
 }
@@ -833,12 +839,6 @@
 .outline-black {
   outline-color: #000;
 }
-.outline-4 {
-  outline-width: 4px;
-}
-.outline-offset-2 {
-  outline-offset: 2px;
-}
 .ring {
   --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width)
     var(--tw-ring-offset-color);