From 9e218a24918d7b370bd9b48098120d5c23956c92 Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Thu, 14 Jun 2018 11:45:08 -0400 Subject: [PATCH 1/2] Add "border-collapse: collapse" table style in Preflight --- __tests__/fixtures/tailwind-output.css | 4 ++++ css/preflight.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 9cd0a44f0..a1a1a533e 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -610,6 +610,10 @@ button, cursor: pointer; } +table { + border-collapse: collapse; +} + .container { width: 100%; } diff --git a/css/preflight.css b/css/preflight.css index 3e17e71ab..0736fa570 100644 --- a/css/preflight.css +++ b/css/preflight.css @@ -589,3 +589,7 @@ input::placeholder, textarea::placeholder { button, [role=button] { cursor: pointer; } + +table { + border-collapse: collapse; +} From d0d70b8282c3f92a3ac11e86f5c373ed8810a8ae Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Thu, 14 Jun 2018 11:46:04 -0400 Subject: [PATCH 2/2] Add "border-collapse" and "border-separate" utilities --- __tests__/fixtures/tailwind-output.css | 8 ++++++++ defaultConfig.stub.js | 1 + src/generators/borderCollapse.js | 8 ++++++++ src/utilityModules.js | 2 ++ 4 files changed, 19 insertions(+) create mode 100644 src/generators/borderCollapse.js diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index a1a1a533e..54f03a2d2 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -1311,6 +1311,14 @@ table { background-size: contain; } +.border-collapse { + border-collapse: collapse; +} + +.border-separate { + border-collapse: separate; +} + .border-transparent { border-color: transparent; } diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index b2cf9fc6e..967304833 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -842,6 +842,7 @@ module.exports = { backgroundPosition: ['responsive'], backgroundRepeat: ['responsive'], backgroundSize: ['responsive'], + borderCollapse: [], borderColors: ['responsive', 'hover'], borderRadius: ['responsive'], borderStyle: ['responsive'], diff --git a/src/generators/borderCollapse.js b/src/generators/borderCollapse.js new file mode 100644 index 000000000..321c89742 --- /dev/null +++ b/src/generators/borderCollapse.js @@ -0,0 +1,8 @@ +import defineClasses from '../util/defineClasses' + +export default function() { + return defineClasses({ + 'border-collapse': { 'border-collapse': 'collapse' }, + 'border-separate': { 'border-collapse': 'separate' }, + }) +} diff --git a/src/utilityModules.js b/src/utilityModules.js index d22b9a6c4..f6f124896 100644 --- a/src/utilityModules.js +++ b/src/utilityModules.js @@ -5,6 +5,7 @@ import backgroundColors from './generators/backgroundColors' import backgroundPosition from './generators/backgroundPosition' import backgroundRepeat from './generators/backgroundRepeat' import backgroundSize from './generators/backgroundSize' +import borderCollapse from './generators/borderCollapse' import borderColors from './generators/borderColors' import borderRadius from './generators/borderRadius' import borderStyle from './generators/borderStyle' @@ -52,6 +53,7 @@ export default [ { name: 'backgroundPosition', generator: backgroundPosition }, { name: 'backgroundRepeat', generator: backgroundRepeat }, { name: 'backgroundSize', generator: backgroundSize }, + { name: 'borderCollapse', generator: borderCollapse }, { name: 'borderColors', generator: borderColors }, { name: 'borderRadius', generator: borderRadius }, { name: 'borderStyle', generator: borderStyle },