From 10106e2edc4a4457a80552e58e798eb0bc238e34 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Tue, 26 Feb 2019 09:57:25 -0500
Subject: [PATCH] Move flex display utilities to display plugin

---
 .../fixtures/tailwind-output-important.css    | 80 +++++++++----------
 __tests__/fixtures/tailwind-output.css        | 80 +++++++++----------
 src/plugins/display.js                        |  6 ++
 src/plugins/flexbox.js                        |  6 --
 4 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css
index 48b681066..94c010dc6 100644
--- a/__tests__/fixtures/tailwind-output-important.css
+++ b/__tests__/fixtures/tailwind-output-important.css
@@ -2703,6 +2703,14 @@ table {
   display: inline !important;
 }
 
+.flex {
+  display: flex !important;
+}
+
+.inline-flex {
+  display: inline-flex !important;
+}
+
 .table {
   display: table !important;
 }
@@ -2719,14 +2727,6 @@ table {
   display: none !important;
 }
 
-.flex {
-  display: flex !important;
-}
-
-.inline-flex {
-  display: inline-flex !important;
-}
-
 .flex-row {
   flex-direction: row !important;
 }
@@ -8388,6 +8388,14 @@ table {
     display: inline !important;
   }
 
+  .sm\:flex {
+    display: flex !important;
+  }
+
+  .sm\:inline-flex {
+    display: inline-flex !important;
+  }
+
   .sm\:table {
     display: table !important;
   }
@@ -8404,14 +8412,6 @@ table {
     display: none !important;
   }
 
-  .sm\:flex {
-    display: flex !important;
-  }
-
-  .sm\:inline-flex {
-    display: inline-flex !important;
-  }
-
   .sm\:flex-row {
     flex-direction: row !important;
   }
@@ -14058,6 +14058,14 @@ table {
     display: inline !important;
   }
 
+  .md\:flex {
+    display: flex !important;
+  }
+
+  .md\:inline-flex {
+    display: inline-flex !important;
+  }
+
   .md\:table {
     display: table !important;
   }
@@ -14074,14 +14082,6 @@ table {
     display: none !important;
   }
 
-  .md\:flex {
-    display: flex !important;
-  }
-
-  .md\:inline-flex {
-    display: inline-flex !important;
-  }
-
   .md\:flex-row {
     flex-direction: row !important;
   }
@@ -19728,6 +19728,14 @@ table {
     display: inline !important;
   }
 
+  .lg\:flex {
+    display: flex !important;
+  }
+
+  .lg\:inline-flex {
+    display: inline-flex !important;
+  }
+
   .lg\:table {
     display: table !important;
   }
@@ -19744,14 +19752,6 @@ table {
     display: none !important;
   }
 
-  .lg\:flex {
-    display: flex !important;
-  }
-
-  .lg\:inline-flex {
-    display: inline-flex !important;
-  }
-
   .lg\:flex-row {
     flex-direction: row !important;
   }
@@ -25398,6 +25398,14 @@ table {
     display: inline !important;
   }
 
+  .xl\:flex {
+    display: flex !important;
+  }
+
+  .xl\:inline-flex {
+    display: inline-flex !important;
+  }
+
   .xl\:table {
     display: table !important;
   }
@@ -25414,14 +25422,6 @@ table {
     display: none !important;
   }
 
-  .xl\:flex {
-    display: flex !important;
-  }
-
-  .xl\:inline-flex {
-    display: inline-flex !important;
-  }
-
   .xl\:flex-row {
     flex-direction: row !important;
   }
diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
index 6a5c8bdc6..d8005d2c1 100644
--- a/__tests__/fixtures/tailwind-output.css
+++ b/__tests__/fixtures/tailwind-output.css
@@ -2703,6 +2703,14 @@ table {
   display: inline;
 }
 
+.flex {
+  display: flex;
+}
+
+.inline-flex {
+  display: inline-flex;
+}
+
 .table {
   display: table;
 }
@@ -2719,14 +2727,6 @@ table {
   display: none;
 }
 
-.flex {
-  display: flex;
-}
-
-.inline-flex {
-  display: inline-flex;
-}
-
 .flex-row {
   flex-direction: row;
 }
@@ -8388,6 +8388,14 @@ table {
     display: inline;
   }
 
+  .sm\:flex {
+    display: flex;
+  }
+
+  .sm\:inline-flex {
+    display: inline-flex;
+  }
+
   .sm\:table {
     display: table;
   }
@@ -8404,14 +8412,6 @@ table {
     display: none;
   }
 
-  .sm\:flex {
-    display: flex;
-  }
-
-  .sm\:inline-flex {
-    display: inline-flex;
-  }
-
   .sm\:flex-row {
     flex-direction: row;
   }
@@ -14058,6 +14058,14 @@ table {
     display: inline;
   }
 
+  .md\:flex {
+    display: flex;
+  }
+
+  .md\:inline-flex {
+    display: inline-flex;
+  }
+
   .md\:table {
     display: table;
   }
@@ -14074,14 +14082,6 @@ table {
     display: none;
   }
 
-  .md\:flex {
-    display: flex;
-  }
-
-  .md\:inline-flex {
-    display: inline-flex;
-  }
-
   .md\:flex-row {
     flex-direction: row;
   }
@@ -19728,6 +19728,14 @@ table {
     display: inline;
   }
 
+  .lg\:flex {
+    display: flex;
+  }
+
+  .lg\:inline-flex {
+    display: inline-flex;
+  }
+
   .lg\:table {
     display: table;
   }
@@ -19744,14 +19752,6 @@ table {
     display: none;
   }
 
-  .lg\:flex {
-    display: flex;
-  }
-
-  .lg\:inline-flex {
-    display: inline-flex;
-  }
-
   .lg\:flex-row {
     flex-direction: row;
   }
@@ -25398,6 +25398,14 @@ table {
     display: inline;
   }
 
+  .xl\:flex {
+    display: flex;
+  }
+
+  .xl\:inline-flex {
+    display: inline-flex;
+  }
+
   .xl\:table {
     display: table;
   }
@@ -25414,14 +25422,6 @@ table {
     display: none;
   }
 
-  .xl\:flex {
-    display: flex;
-  }
-
-  .xl\:inline-flex {
-    display: inline-flex;
-  }
-
   .xl\:flex-row {
     flex-direction: row;
   }
diff --git a/src/plugins/display.js b/src/plugins/display.js
index 98c190e3b..0dd583453 100644
--- a/src/plugins/display.js
+++ b/src/plugins/display.js
@@ -11,6 +11,12 @@ export default function({ variants }) {
         '.inline': {
           display: 'inline',
         },
+        '.flex': {
+          display: 'flex',
+        },
+        '.inline-flex': {
+          display: 'inline-flex',
+        },
         '.table': {
           display: 'table',
         },
diff --git a/src/plugins/flexbox.js b/src/plugins/flexbox.js
index b27b5e065..fadf35134 100644
--- a/src/plugins/flexbox.js
+++ b/src/plugins/flexbox.js
@@ -2,12 +2,6 @@ export default function({ variants }) {
   return function({ addUtilities }) {
     addUtilities(
       {
-        '.flex': {
-          display: 'flex',
-        },
-        '.inline-flex': {
-          display: 'inline-flex',
-        },
         '.flex-row': {
           'flex-direction': 'row',
         },