Skip to content

Commit 4a43559

Browse files
authored
Merge pull request #656 from tailwindcss/rename-plugins
Rename core plugins to closer mirror CSS properties and modules
2 parents e2b9511 + 87192f8 commit 4a43559

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+674
-638
lines changed

__tests__/fixtures/tailwind-output-important.css

Lines changed: 275 additions & 275 deletions
Large diffs are not rendered by default.

__tests__/fixtures/tailwind-output.css

Lines changed: 275 additions & 275 deletions
Large diffs are not rendered by default.

defaultConfig.stub.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ module.exports = {
88
variants: {
99
appearance: ['responsive'],
1010
backgroundAttachment: ['responsive'],
11-
backgroundColors: ['responsive', 'hover', 'focus'],
11+
backgroundColor: ['responsive', 'hover', 'focus'],
1212
backgroundPosition: ['responsive'],
1313
backgroundRepeat: ['responsive'],
1414
backgroundSize: ['responsive'],
1515
borderCollapse: [],
16-
borderColors: ['responsive', 'hover', 'focus'],
16+
borderColor: ['responsive', 'hover', 'focus'],
1717
borderRadius: ['responsive'],
1818
borderStyle: ['responsive'],
19-
borderWidths: ['responsive'],
19+
borderWidth: ['responsive'],
2020
cursor: ['responsive'],
2121
display: ['responsive'],
2222
flexbox: ['responsive'],
2323
float: ['responsive'],
24-
fonts: ['responsive'],
25-
fontWeights: ['responsive', 'hover', 'focus'],
24+
fontFamily: ['responsive'],
25+
fontWeight: ['responsive', 'hover', 'focus'],
2626
height: ['responsive'],
2727
leading: ['responsive'],
28-
lists: ['responsive'],
28+
listStyle: ['responsive'],
2929
margin: ['responsive'],
3030
maxHeight: ['responsive'],
3131
maxWidth: ['responsive'],
@@ -41,14 +41,17 @@ module.exports = {
4141
pointerEvents: ['responsive'],
4242
position: ['responsive'],
4343
resize: ['responsive'],
44-
shadows: ['responsive', 'hover', 'focus'],
45-
svgFill: [],
46-
svgStroke: [],
44+
boxShadow: ['responsive', 'hover', 'focus'],
45+
fill: [],
46+
stroke: [],
4747
tableLayout: ['responsive'],
4848
textAlign: ['responsive'],
49-
textColors: ['responsive', 'hover', 'focus'],
50-
textSizes: ['responsive'],
51-
textStyle: ['responsive', 'hover', 'focus'],
49+
textColor: ['responsive', 'hover', 'focus'],
50+
fontSize: ['responsive'],
51+
fontStyle: ['responsive', 'hover', 'focus'],
52+
textTransform: ['responsive', 'hover', 'focus'],
53+
textDecoration: ['responsive', 'hover', 'focus'],
54+
fontSmoothing: ['responsive', 'hover', 'focus'],
5255
tracking: ['responsive'],
5356
userSelect: ['responsive'],
5457
verticalAlign: ['responsive'],

defaultTheme.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ module.exports = function() {
108108
lg: '992px',
109109
xl: '1200px',
110110
},
111-
fonts: {
111+
fontFamily: {
112112
sans: [
113113
'system-ui',
114114
'BlinkMacSystemFont',
@@ -137,7 +137,7 @@ module.exports = function() {
137137
],
138138
mono: ['Menlo', 'Monaco', 'Consolas', 'Liberation Mono', 'Courier New', 'monospace'],
139139
},
140-
textSizes: {
140+
fontSize: {
141141
xs: '.75rem', // 12px
142142
sm: '.875rem', // 14px
143143
base: '1rem', // 16px
@@ -148,7 +148,7 @@ module.exports = function() {
148148
'4xl': '2.25rem', // 36px
149149
'5xl': '3rem', // 48px
150150
},
151-
fontWeights: {
151+
fontWeight: {
152152
hairline: 100,
153153
thin: 200,
154154
light: 300,
@@ -170,8 +170,8 @@ module.exports = function() {
170170
normal: '0',
171171
wide: '0.05em',
172172
},
173-
textColors: theme => theme.colors,
174-
backgroundColors: theme => theme.colors,
173+
textColor: theme => theme.colors,
174+
backgroundColor: theme => theme.colors,
175175
backgroundPosition: {
176176
bottom: 'bottom',
177177
center: 'center',
@@ -188,14 +188,14 @@ module.exports = function() {
188188
cover: 'cover',
189189
contain: 'contain',
190190
},
191-
borderWidths: {
191+
borderWidth: {
192192
default: '1px',
193193
'0': '0',
194194
'2': '2px',
195195
'4': '4px',
196196
'8': '8px',
197197
},
198-
borderColors: theme => {
198+
borderColor: theme => {
199199
return global.Object.assign({ default: theme.colors['grey-light'] }, theme.colors)
200200
},
201201
borderRadius: {
@@ -260,7 +260,7 @@ module.exports = function() {
260260
padding: theme => theme.spacing,
261261
margin: theme => ({ auto: 'auto', ...theme.spacing }),
262262
negativeMargin: theme => theme.spacing,
263-
shadows: {
263+
boxShadow: {
264264
default: '0 2px 4px 0 rgba(0,0,0,0.10)',
265265
md: '0 4px 8px 0 rgba(0,0,0,0.12), 0 2px 4px 0 rgba(0,0,0,0.08)',
266266
lg: '0 15px 30px 0 rgba(0,0,0,0.11), 0 5px 15px 0 rgba(0,0,0,0.08)',
@@ -284,10 +284,10 @@ module.exports = function() {
284284
'75': '.75',
285285
'100': '1',
286286
},
287-
svgFill: {
287+
fill: {
288288
current: 'currentColor',
289289
},
290-
svgStroke: {
290+
stroke: {
291291
current: 'currentColor',
292292
},
293293
}

plugins/backgroundColor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('../lib/plugins/backgroundColor').default

plugins/backgroundColors.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/borderColor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('../lib/plugins/borderColor').default

plugins/borderColors.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/borderWidth.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('../lib/plugins/borderWidth').default

plugins/borderWidths.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)