From 0966f07211037ee053e0ac4a795301310138d3d1 Mon Sep 17 00:00:00 2001 From: Danilo Alonso Date: Thu, 9 Nov 2017 15:03:22 -0500 Subject: [PATCH 1/5] add border solid to generators and docs --- docs/source/docs/border-style.blade.md | 5 +++++ src/generators/borderStyles.js | 3 +++ 2 files changed, 8 insertions(+) diff --git a/docs/source/docs/border-style.blade.md b/docs/source/docs/border-style.blade.md index a58ba904e243..8b650f5bdb0a 100644 --- a/docs/source/docs/border-style.blade.md +++ b/docs/source/docs/border-style.blade.md @@ -21,6 +21,11 @@ features: + + .border-solid + border-style: solid; + Sets the border style on an element to solid. + .border-dashed border-style: dashed; diff --git a/src/generators/borderStyles.js b/src/generators/borderStyles.js index 8151a1bb51ca..3dfca388c490 100644 --- a/src/generators/borderStyles.js +++ b/src/generators/borderStyles.js @@ -2,6 +2,9 @@ import defineClasses from '../util/defineClasses' export default function() { return defineClasses({ + 'border-solid': { + 'border-style': 'solid', + }, 'border-dashed': { 'border-style': 'dashed', }, From 77b0efad48352dbf012595ce54cb91661615769c Mon Sep 17 00:00:00 2001 From: Danilo Alonso Date: Thu, 9 Nov 2017 15:10:42 -0500 Subject: [PATCH 2/5] added all other styles --- docs/source/docs/border-style.blade.md | 25 +++++++++++++++++++++++++ src/generators/borderStyles.js | 18 ++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/docs/source/docs/border-style.blade.md b/docs/source/docs/border-style.blade.md index 8b650f5bdb0a..8eb4de07967b 100644 --- a/docs/source/docs/border-style.blade.md +++ b/docs/source/docs/border-style.blade.md @@ -21,6 +21,31 @@ features: + + .double-solid + border-style: double; + Sets the border style on an element to double. + + + .groove-solid + border-style: groove; + Sets the border style on an element to groove. + + + .ridge-solid + border-style: ridge; + Sets the border style on an element to ridge. + + + .inset-solid + border-style: inset; + Sets the border style on an element to inset. + + + .outset-solid + border-style: outset; + Sets the border style on an element to outset. + .border-solid border-style: solid; diff --git a/src/generators/borderStyles.js b/src/generators/borderStyles.js index 3dfca388c490..9846d342ddc4 100644 --- a/src/generators/borderStyles.js +++ b/src/generators/borderStyles.js @@ -2,6 +2,21 @@ import defineClasses from '../util/defineClasses' export default function() { return defineClasses({ + 'border-double': { + 'border-style': 'double', + }, + 'border-groove': { + 'border-style': 'groove', + }, + 'border-ridge': { + 'border-style': 'ridge', + }, + 'border-inset': { + 'border-style': 'inset', + }, + 'border-outset': { + 'border-style': 'outset', + }, 'border-solid': { 'border-style': 'solid', }, @@ -16,3 +31,6 @@ export default function() { }, }) } + + + From f8112c6b3355376686f4737d4369116580ab5c4f Mon Sep 17 00:00:00 2001 From: Danilo Alonso Date: Thu, 9 Nov 2017 16:09:10 -0500 Subject: [PATCH 3/5] updating for to pass tests --- __tests__/fixtures/tailwind-output.css | 120 +++++++++++++++++++++++++ src/generators/borderStyles.js | 3 - 2 files changed, 120 insertions(+), 3 deletions(-) diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 80f04b802cf6..4928877d092c 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -2096,6 +2096,30 @@ button, border-color: #ffebef; } +.border-double { + border-style: double; +} + +.border-groove { + border-style: groove; +} + +.border-ridge { + border-style: ridge; +} + +.border-inset { + border-style: inset; +} + +.border-outset { + border-style: outset; +} + +.border-solid { + border-style: solid; +} + .border-dashed { border-style: dashed; } @@ -5060,6 +5084,30 @@ button, border-color: #ffebef; } + .sm\:border-double { + border-style: double; + } + + .sm\:border-groove { + border-style: groove; + } + + .sm\:border-ridge { + border-style: ridge; + } + + .sm\:border-inset { + border-style: inset; + } + + .sm\:border-outset { + border-style: outset; + } + + .sm\:border-solid { + border-style: solid; + } + .sm\:border-dashed { border-style: dashed; } @@ -8025,6 +8073,30 @@ button, border-color: #ffebef; } + .md\:border-double { + border-style: double; + } + + .md\:border-groove { + border-style: groove; + } + + .md\:border-ridge { + border-style: ridge; + } + + .md\:border-inset { + border-style: inset; + } + + .md\:border-outset { + border-style: outset; + } + + .md\:border-solid { + border-style: solid; + } + .md\:border-dashed { border-style: dashed; } @@ -10990,6 +11062,30 @@ button, border-color: #ffebef; } + .lg\:border-double { + border-style: double; + } + + .lg\:border-groove { + border-style: groove; + } + + .lg\:border-ridge { + border-style: ridge; + } + + .lg\:border-inset { + border-style: inset; + } + + .lg\:border-outset { + border-style: outset; + } + + .lg\:border-solid { + border-style: solid; + } + .lg\:border-dashed { border-style: dashed; } @@ -13955,6 +14051,30 @@ button, border-color: #ffebef; } + .xl\:border-double { + border-style: double; + } + + .xl\:border-groove { + border-style: groove; + } + + .xl\:border-ridge { + border-style: ridge; + } + + .xl\:border-inset { + border-style: inset; + } + + .xl\:border-outset { + border-style: outset; + } + + .xl\:border-solid { + border-style: solid; + } + .xl\:border-dashed { border-style: dashed; } diff --git a/src/generators/borderStyles.js b/src/generators/borderStyles.js index 9846d342ddc4..d0126d4ab7d1 100644 --- a/src/generators/borderStyles.js +++ b/src/generators/borderStyles.js @@ -31,6 +31,3 @@ export default function() { }, }) } - - - From 042b7c3dc66cc5ecbd8b4b243335088dbab7279b Mon Sep 17 00:00:00 2001 From: Danilo Alonso Date: Thu, 9 Nov 2017 17:43:11 -0500 Subject: [PATCH 4/5] only border solid --- docs/source/docs/border-style.blade.md | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/docs/source/docs/border-style.blade.md b/docs/source/docs/border-style.blade.md index b0e8e7e35a44..2915da67c318 100644 --- a/docs/source/docs/border-style.blade.md +++ b/docs/source/docs/border-style.blade.md @@ -21,31 +21,6 @@ features: - - .double-solid - border-style: double; - Sets the border style on an element to double. - - - .groove-solid - border-style: groove; - Sets the border style on an element to groove. - - - .ridge-solid - border-style: ridge; - Sets the border style on an element to ridge. - - - .inset-solid - border-style: inset; - Sets the border style on an element to inset. - - - .outset-solid - border-style: outset; - Sets the border style on an element to outset. - .border-solid border-style: solid; From 558239a3252ecf62adca81fe2d596ef20e8ca526 Mon Sep 17 00:00:00 2001 From: Danilo Alonso Date: Thu, 9 Nov 2017 17:45:41 -0500 Subject: [PATCH 5/5] only border solid --- __tests__/fixtures/tailwind-output.css | 100 ------------------------- src/generators/borderStyles.js | 15 ---- 2 files changed, 115 deletions(-) diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 4928877d092c..a05673c55015 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -2096,26 +2096,6 @@ button, border-color: #ffebef; } -.border-double { - border-style: double; -} - -.border-groove { - border-style: groove; -} - -.border-ridge { - border-style: ridge; -} - -.border-inset { - border-style: inset; -} - -.border-outset { - border-style: outset; -} - .border-solid { border-style: solid; } @@ -5084,26 +5064,6 @@ button, border-color: #ffebef; } - .sm\:border-double { - border-style: double; - } - - .sm\:border-groove { - border-style: groove; - } - - .sm\:border-ridge { - border-style: ridge; - } - - .sm\:border-inset { - border-style: inset; - } - - .sm\:border-outset { - border-style: outset; - } - .sm\:border-solid { border-style: solid; } @@ -8073,26 +8033,6 @@ button, border-color: #ffebef; } - .md\:border-double { - border-style: double; - } - - .md\:border-groove { - border-style: groove; - } - - .md\:border-ridge { - border-style: ridge; - } - - .md\:border-inset { - border-style: inset; - } - - .md\:border-outset { - border-style: outset; - } - .md\:border-solid { border-style: solid; } @@ -11062,26 +11002,6 @@ button, border-color: #ffebef; } - .lg\:border-double { - border-style: double; - } - - .lg\:border-groove { - border-style: groove; - } - - .lg\:border-ridge { - border-style: ridge; - } - - .lg\:border-inset { - border-style: inset; - } - - .lg\:border-outset { - border-style: outset; - } - .lg\:border-solid { border-style: solid; } @@ -14051,26 +13971,6 @@ button, border-color: #ffebef; } - .xl\:border-double { - border-style: double; - } - - .xl\:border-groove { - border-style: groove; - } - - .xl\:border-ridge { - border-style: ridge; - } - - .xl\:border-inset { - border-style: inset; - } - - .xl\:border-outset { - border-style: outset; - } - .xl\:border-solid { border-style: solid; } diff --git a/src/generators/borderStyles.js b/src/generators/borderStyles.js index d0126d4ab7d1..3dfca388c490 100644 --- a/src/generators/borderStyles.js +++ b/src/generators/borderStyles.js @@ -2,21 +2,6 @@ import defineClasses from '../util/defineClasses' export default function() { return defineClasses({ - 'border-double': { - 'border-style': 'double', - }, - 'border-groove': { - 'border-style': 'groove', - }, - 'border-ridge': { - 'border-style': 'ridge', - }, - 'border-inset': { - 'border-style': 'inset', - }, - 'border-outset': { - 'border-style': 'outset', - }, 'border-solid': { 'border-style': 'solid', },