Fix conflicts

KKAC · Mar 12, 2018 · c63bf4f · c63bf4f
2 parents dbb4802 + 8537ceb
commit c63bf4f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
@@ -3477,6 +3477,10 @@ button,
   position: relative;
 }
 
+.sticky {
+  position: sticky;
+}
+
 .pin-none {
   top: auto;
   right: auto;
@@ -7360,6 +7364,10 @@ button,
     position: relative;
   }
 
+  .sm\:sticky {
+    position: sticky;
+  }
+
   .sm\:pin-none {
     top: auto;
     right: auto;
@@ -11236,6 +11244,10 @@ button,
     position: relative;
   }
 
+  .md\:sticky {
+    position: sticky;
+  }
+
   .md\:pin-none {
     top: auto;
     right: auto;
@@ -15112,6 +15124,10 @@ button,
     position: relative;
   }
 
+  .lg\:sticky {
+    position: sticky;
+  }
+
   .lg\:pin-none {
     top: auto;
     right: auto;
@@ -18988,6 +19004,10 @@ button,
     position: relative;
   }
 
+  .xl\:sticky {
+    position: sticky;
+  }
+
   .xl\:pin-none {
     top: auto;
     right: auto;

diff --git a/src/generators/position.js b/src/generators/position.js
@@ -6,6 +6,7 @@ export default function() {
     fixed: { position: 'fixed' },
     absolute: { position: 'absolute' },
     relative: { position: 'relative' },
+    sticky: { position: 'sticky' },
     'pin-none': {
       top: 'auto',
       right: 'auto',