diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 412aafe6a..fe806ad3f 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -2859,14 +2859,14 @@ table { flex-grow: 1 !important; } -.flex-shrink { - flex-shrink: 1 !important; -} - .flex-shrink-0 { flex-shrink: 0 !important; } +.flex-shrink { + flex-shrink: 1 !important; +} + .float-right { float: right !important; } @@ -8544,14 +8544,14 @@ table { flex-grow: 1 !important; } - .sm\:flex-shrink { - flex-shrink: 1 !important; - } - .sm\:flex-shrink-0 { flex-shrink: 0 !important; } + .sm\:flex-shrink { + flex-shrink: 1 !important; + } + .sm\:float-right { float: right !important; } @@ -14214,14 +14214,14 @@ table { flex-grow: 1 !important; } - .md\:flex-shrink { - flex-shrink: 1 !important; - } - .md\:flex-shrink-0 { flex-shrink: 0 !important; } + .md\:flex-shrink { + flex-shrink: 1 !important; + } + .md\:float-right { float: right !important; } @@ -19884,14 +19884,14 @@ table { flex-grow: 1 !important; } - .lg\:flex-shrink { - flex-shrink: 1 !important; - } - .lg\:flex-shrink-0 { flex-shrink: 0 !important; } + .lg\:flex-shrink { + flex-shrink: 1 !important; + } + .lg\:float-right { float: right !important; } @@ -25554,14 +25554,14 @@ table { flex-grow: 1 !important; } - .xl\:flex-shrink { - flex-shrink: 1 !important; - } - .xl\:flex-shrink-0 { flex-shrink: 0 !important; } + .xl\:flex-shrink { + flex-shrink: 1 !important; + } + .xl\:float-right { float: right !important; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 34bedaf5e..b4ebd9cd3 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -2859,14 +2859,14 @@ table { flex-grow: 1; } -.flex-shrink { - flex-shrink: 1; -} - .flex-shrink-0 { flex-shrink: 0; } +.flex-shrink { + flex-shrink: 1; +} + .float-right { float: right; } @@ -8544,14 +8544,14 @@ table { flex-grow: 1; } - .sm\:flex-shrink { - flex-shrink: 1; - } - .sm\:flex-shrink-0 { flex-shrink: 0; } + .sm\:flex-shrink { + flex-shrink: 1; + } + .sm\:float-right { float: right; } @@ -14214,14 +14214,14 @@ table { flex-grow: 1; } - .md\:flex-shrink { - flex-shrink: 1; - } - .md\:flex-shrink-0 { flex-shrink: 0; } + .md\:flex-shrink { + flex-shrink: 1; + } + .md\:float-right { float: right; } @@ -19884,14 +19884,14 @@ table { flex-grow: 1; } - .lg\:flex-shrink { - flex-shrink: 1; - } - .lg\:flex-shrink-0 { flex-shrink: 0; } + .lg\:flex-shrink { + flex-shrink: 1; + } + .lg\:float-right { float: right; } @@ -25554,14 +25554,14 @@ table { flex-grow: 1; } - .xl\:flex-shrink { - flex-shrink: 1; - } - .xl\:flex-shrink-0 { flex-shrink: 0; } + .xl\:flex-shrink { + flex-shrink: 1; + } + .xl\:float-right { float: right; } diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index b2789c96f..7f3ad5edc 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -27,7 +27,7 @@ module.exports = { alignContent: ['responsive'], flex: ['responsive'], flexGrow: ['responsive'], - flexbox: ['responsive'], + flexShrink: ['responsive'], float: ['responsive'], fontFamily: ['responsive'], fontWeight: ['responsive', 'hover', 'focus'], diff --git a/src/corePlugins.js b/src/corePlugins.js index a3d83ed9d..a1a586194 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -21,7 +21,7 @@ import justifyContent from './plugins/justifyContent' import alignContent from './plugins/alignContent' import flex from './plugins/flex' import flexGrow from './plugins/flexGrow' -import flexbox from './plugins/flexbox' +import flexShrink from './plugins/flexShrink' import float from './plugins/float' import fontFamily from './plugins/fontFamily' import fontWeight from './plugins/fontWeight' @@ -103,7 +103,7 @@ export default function(config) { alignContent, flex, flexGrow, - flexbox, + flexShrink, float, fontFamily, fontWeight, diff --git a/src/plugins/flexbox.js b/src/plugins/flexShrink.js similarity index 100% rename from src/plugins/flexbox.js rename to src/plugins/flexShrink.js index 543fe0fc7..9756405be 100644 --- a/src/plugins/flexbox.js +++ b/src/plugins/flexShrink.js @@ -2,12 +2,12 @@ export default function({ variants }) { return function({ addUtilities }) { addUtilities( { - '.flex-shrink': { - 'flex-shrink': '1', - }, '.flex-shrink-0': { 'flex-shrink': '0', }, + '.flex-shrink': { + 'flex-shrink': '1', + }, }, variants )