merge conflict

Author: damusix

__tests__/fixtures/tailwind-input-with-explicit-screen-utilities.css

@@ -0,0 +1,11 @@
+@responsive {
+    .example {
+        color: red;
+    }
+}
+
+@tailwind screens;
+
+.john {
+    content: "wick";
+}

__tests__/fixtures/tailwind-output-with-explicit-screen-utilities.css

@@ -0,0 +1,31 @@
+.example {
+  color: red;
+}
+
+@media (min-width: 576px) {
+  .sm\:example {
+    color: red;
+  }
+}
+
+@media (min-width: 768px) {
+  .md\:example {
+    color: red;
+  }
+}
+
+@media (min-width: 992px) {
+  .lg\:example {
+    color: red;
+  }
+}
+
+@media (min-width: 1200px) {
+  .xl\:example {
+    color: red;
+  }
+}
+
+.john {
+  content: "wick";
+}

__tests__/sanity.test.js

@@ -28,3 +28,21 @@ it('does not add any CSS if no Tailwind features are used', () => {
       expect(result.css).toBe('')
     })
 })
+
+it('generates the right CSS with implicit screen utilities', () => {
+  const input = fs.readFileSync(
+    path.resolve(`${__dirname}/fixtures/tailwind-input-with-explicit-screen-utilities.css`),
+    'utf8'
+  )
+
+  return postcss([tailwind()])
+    .process(input)
+    .then(result => {
+      const expected = fs.readFileSync(
+        path.resolve(`${__dirname}/fixtures/tailwind-output-with-explicit-screen-utilities.css`),
+        'utf8'
+      )
+
+      expect(result.css).toBe(expected)
+    })
+})

docs/source/_assets/js/app.js

@@ -7,16 +7,16 @@ window.Vue = require('vue')
 Vue.component('responsive-code-sample', require('./components/ResponsiveCodeSample.vue'))
 
 const app = new Vue({
-    el: '#app'
+  el: '#app'
 })
 
 Prism.highlightAll()
-anchors.options = { placement: 'left', class: 'text-slate-light' };
-anchors.add();
+anchors.options = { placement: 'left', class: 'text-slate-light' }
+anchors.add()
 
 // Add shortcut to search input when pressing the "/" key
 document.onkeyup = function (e) {
-    if (e.which == 191) {
-        document.getElementById('docsearch').focus();
-    }
-};
+  if (e.which == 191) {
+    document.getElementById('docsearch').focus()
+  }
+}

docs/source/_assets/js/nav.js

@@ -53,7 +53,6 @@ $.when($.ready).then(function() {
   // Load page history (for back/forward nav)
   window.onpopstate = function(e) {
     if(e.state){
-
       // Update the page
       $('title').text(e.state.title)
       $('#nav').html(e.state.nav)

docs/source/_assets/less/main.less

@@ -7,82 +7,82 @@
 
 code[class*="language-"],
 pre[class*="language-"] {
-    @apply .font-mono;
-    @apply .text-slate-dark;
+  @apply .font-mono;
+  @apply .text-slate-dark;
 
-    background: none;
-    text-align: left;
-    white-space: pre;
-    word-spacing: normal;
-    word-break: normal;
-    word-wrap: normal;
-    line-height: 1.5;
+  background: none;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
 
-    -moz-tab-size: 4;
-    -o-tab-size: 4;
-    tab-size: 4;
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
 
-    -webkit-hyphens: none;
-    -moz-hyphens: none;
-    -ms-hyphens: none;
-    hyphens: none;
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
 
-    font-weight: 400;
+  font-weight: 400;
 }
 
 pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
 code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
-    text-shadow: none;
-    background: #b3d4fc;
+  text-shadow: none;
+  background: #b3d4fc;
 }
 
 pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
 code[class*="language-"]::selection, code[class*="language-"] ::selection {
-    text-shadow: none;
-    background: #b3d4fc;
+  text-shadow: none;
+  background: #b3d4fc;
 }
 
 @media print {
-    code[class*="language-"],
-    pre[class*="language-"] {
-        text-shadow: none;
-    }
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
 }
 
 /* Code blocks */
 pre {
-    padding: 1em;
-    margin: .5em 0;
-    overflow: auto;
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
 }
 
 :not(pre) > code[class*="language-"],
 pre[class*="language-"] {
-    background: transparent;
-    @apply .text-sm;
+  background: transparent;
+  @apply .text-sm;
 }
 
 /* Inline code */
 :not(pre) > code[class*="language-"] {
-    padding: .1em;
-    border-radius: .3em;
-    white-space: normal;
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
 }
 
 .token.comment,
 .token.prolog,
 .token.doctype,
 .token.cdata {
-    @apply .text-grey;
+  @apply .text-grey;
 }
 
 .token.punctuation {
-    @apply .text-blue-dark;
-    // color: #999;
+  @apply .text-blue-dark;
+  // color: #999;
 }
 
 .namespace {
-    opacity: .7;
+  opacity: .7;
 }
 
 .token.property,
@@ -91,19 +91,19 @@ pre[class*="language-"] {
 .token.number,
 .token.constant,
 .token.symbol {
-    @apply .text-blue-dark;
+  @apply .text-blue-dark;
 }
 
 code.language-diff, pre.language-diff {
-    @apply .text-grey-darker;
+  @apply .text-grey-darker;
 }
 
 .token.deleted {
-    @apply .text-grey;
+  @apply .text-grey;
 }
 
 .token.inserted {
-    @apply .text-blue-dark;
+  @apply .text-blue-dark;
 }
 
 // .token.selector,
@@ -112,44 +112,43 @@ code.language-diff, pre.language-diff {
 // .token.builtin,
 // .token.inserted,
 .token.string {
-    @apply .text-purple;
+  @apply .text-purple;
 }
 
 .token.operator,
 .token.entity,
 .token.url,
 .language-css .token.string,
 .style .token.string {
-    color: #a67f59;
-    background: hsla(0, 0%, 100%, .5);
+  color: #a67f59;
+  background: hsla(0, 0%, 100%, .5);
 }
 
 .token.atrule,
 .token.attr-value,
 .token.keyword {
-    @apply .text-purple;
-    // color: #07a;
+  @apply .text-purple;
+  // color: #07a;
 }
 
 .token.function {
-    color: #DD4A68;
+  color: #DD4A68;
 }
 
 .token.regex,
 .token.important,
 .token.variable {
-    color: #e90;
+  color: #e90;
 }
 
 .token.important,
 .token.bold {
-    font-weight: bold;
+  font-weight: bold;
 }
 .token.italic {
-    font-style: italic;
+  font-style: italic;
 }
 
 .token.entity {
-    cursor: help;
+  cursor: help;
 }
-