Skip to content

Commit 2fd9dc5

Browse files
authored
Merge pull request #700 from tailwindcss/make-flex-customizable
Make flex-* utilities customizable
2 parents 4eba10a + 7482ed5 commit 2fd9dc5

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

defaultTheme.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,12 @@ module.exports = function() {
316316
stroke: {
317317
current: 'currentColor',
318318
},
319+
flex: {
320+
'1': '1 1 0%',
321+
auto: '1 1 auto',
322+
initial: '0 1 auto',
323+
none: 'none',
324+
},
319325
flexGrow: {
320326
'0': 0,
321327
default: 1,

src/plugins/flex.js

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1+
import _ from 'lodash'
2+
13
export default function() {
2-
return function({ addUtilities, config }) {
3-
addUtilities(
4-
{
5-
'.flex-1': {
6-
flex: '1 1 0%',
7-
},
8-
'.flex-auto': {
9-
flex: '1 1 auto',
10-
},
11-
'.flex-initial': {
12-
flex: '0 1 auto',
13-
},
14-
'.flex-none': {
15-
flex: 'none',
16-
},
17-
},
18-
config('variants.flex')
4+
return function({ addUtilities, e, config }) {
5+
const utilities = _.fromPairs(
6+
_.map(config('theme.flex'), (value, modifier) => {
7+
return [
8+
`.${e(`flex-${modifier}`)}`,
9+
{
10+
flex: value,
11+
},
12+
]
13+
})
1914
)
15+
16+
addUtilities(utilities, config('variants.flex'))
2017
}
2118
}

0 commit comments

Comments
 (0)