Merge branch 'master' into skew

Author: benface

__tests__/fixtures/tailwind-output-important.css

@@ -0,0 +1,57 @@
+import _ from 'lodash'
+import escapeClassName from '../../src/util/escapeClassName'
+import plugin from '../../src/plugins/strokeWidth'
+
+test('the width of the stroke to be applied to the shape', () => {
+  const addedUtilities = []
+
+  const config = {
+    theme: {
+      strokeWidth: {
+        '0': '0',
+        '1': '1px',
+        '2': '2px',
+        '3': '3px',
+        '4': '4px',
+      },
+    },
+    variants: {
+      strokeWidth: ['responsive'],
+    },
+  }
+
+  const getConfigValue = (path, defaultValue) => _.get(config, path, defaultValue)
+  const pluginApi = {
+    config: getConfigValue,
+    e: escapeClassName,
+    theme: (path, defaultValue) => getConfigValue(`theme.${path}`, defaultValue),
+    variants: (path, defaultValue) => {
+      if (_.isArray(config.variants)) {
+        return config.variants
+      }
+
+      return getConfigValue(`variants.${path}`, defaultValue)
+    },
+    addUtilities(utilities, variants) {
+      addedUtilities.push({
+        utilities,
+        variants,
+      })
+    },
+  }
+
+  plugin()(pluginApi)
+
+  expect(addedUtilities).toEqual([
+    {
+      utilities: {
+        '.stroke-w-0': { 'stroke-width': '0' },
+        '.stroke-w-1': { 'stroke-width': '1px' },
+        '.stroke-w-2': { 'stroke-width': '2px' },
+        '.stroke-w-3': { 'stroke-width': '3px' },
+        '.stroke-w-4': { 'stroke-width': '4px' },
+      },
+      variants: ['responsive'],
+    },
+  ])
+})

__tests__/fixtures/tailwind-output.css

@@ -52,6 +52,7 @@ import resize from './plugins/resize'
 import boxShadow from './plugins/boxShadow'
 import fill from './plugins/fill'
 import stroke from './plugins/stroke'
+import strokeWidth from './plugins/strokeWidth'
 import tableLayout from './plugins/tableLayout'
 import textAlign from './plugins/textAlign'
 import textColor from './plugins/textColor'
@@ -74,6 +75,18 @@ import scale from './plugins/scale'
 import rotate from './plugins/rotate'
 import translate from './plugins/translate'
 import skew from './plugins/skew'
+import gap from './plugins/gap'
+import columnGap from './plugins/columnGap'
+import rowGap from './plugins/rowGap'
+import gridAutoFlow from './plugins/gridAutoFlow'
+import gridTemplateColumns from './plugins/gridTemplateColumns'
+import gridColumn from './plugins/gridColumn'
+import gridColumnStart from './plugins/gridColumnStart'
+import gridColumnEnd from './plugins/gridColumnEnd'
+import gridTemplateRows from './plugins/gridTemplateRows'
+import gridRow from './plugins/gridRow'
+import gridRowStart from './plugins/gridRowStart'
+import gridRowEnd from './plugins/gridRowEnd'
 
 import configurePlugins from './util/configurePlugins'
 
@@ -133,6 +146,7 @@ export default function({ corePlugins: corePluginConfig }) {
     boxShadow,
     fill,
     stroke,
+    strokeWidth,
     tableLayout,
     textAlign,
     textColor,
@@ -149,6 +163,18 @@ export default function({ corePlugins: corePluginConfig }) {
     wordBreak,
     width,
     zIndex,
+    gap,
+    columnGap,
+    rowGap,
+    gridAutoFlow,
+    gridTemplateColumns,
+    gridColumn,
+    gridColumnStart,
+    gridColumnEnd,
+    gridTemplateRows,
+    gridRow,
+    gridRowStart,
+    gridRowEnd,
     transform,
     transformOrigin,
     scale,

__tests__/plugins/strokeWidth.test.js

@@ -2,8 +2,8 @@ export default function() {
   return function({ addUtilities, variants }) {
     addUtilities(
       {
-        '.box-border': { 'box-sizing': 'border' },
-        '.box-content': { 'box-sizing': 'content' },
+        '.box-border': { 'box-sizing': 'border-box' },
+        '.box-content': { 'box-sizing': 'content-box' },
       },
       variants('boxSizing')
     )

src/corePlugins.js

@@ -0,0 +1,5 @@
+import createUtilityPlugin from '../util/createUtilityPlugin'
+
+export default function() {
+  return createUtilityPlugin('columnGap', [['col-gap', ['gridColumnGap', 'columnGap']]])
+}

src/plugins/boxSizing.js

@@ -17,6 +17,9 @@ export default function() {
         '.inline-flex': {
           display: 'inline-flex',
         },
+        '.grid': {
+          display: 'grid',
+        },
         '.table': {
           display: 'table',
         },

src/plugins/columnGap.js

@@ -0,0 +1,5 @@
+import createUtilityPlugin from '../util/createUtilityPlugin'
+
+export default function() {
+  return createUtilityPlugin('gap', [['gap', ['gridGap', 'gap']]])
+}

src/plugins/display.js

@@ -0,0 +1,13 @@
+export default function() {
+  return function({ addUtilities, variants }) {
+    addUtilities(
+      {
+        '.grid-flow-row': { gridAutoFlow: 'row' },
+        '.grid-flow-col': { gridAutoFlow: 'column' },
+        '.grid-flow-row-dense': { gridAutoFlow: 'row dense' },
+        '.grid-flow-col-dense': { gridAutoFlow: 'column dense' },
+      },
+      variants('gridAutoFlow')
+    )
+  }
+}

src/plugins/gap.js

@@ -0,0 +1,5 @@
+import createUtilityPlugin from '../util/createUtilityPlugin'
+
+export default function() {
+  return createUtilityPlugin('gridColumn', [['col', ['gridColumn']]])
+}