archive-gh-me/tailwindcss
1
0
Fork 0
mirror of https://github.com/tailwindlabs/tailwindcss.git synced 2025-12-08 21:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #697 from tailwindcss/rename-config-to-theme

Browse Source 
Remove config() function in favor of theme()
This commit is contained in:
Adam Wathan 2019-03-05 09:42:58 -05:00 committed by GitHub
commit 43ea7311d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
__tests__/fixtures/tailwind-input.css
View File

@ -7,6 +7,6 @@
@responsive {
.example {
@apply .font-bold;
color: config('theme.colors.red');
color: theme('colors.red');
}
}

10
__tests__/configFunction.test.js → __tests__/themeFunction.test.js
View File

@ -5,9 +5,9 @@ function run(input, opts = {}) {
return postcss([plugin(opts)]).process(input, { from: undefined })
}
test('it looks up values in the config using dot notation', () => {
test('it looks up values in the theme using dot notation', () => {
const input = `
.banana { color: config('theme.colors.yellow'); }
.banana { color: theme('colors.yellow'); }
`
const output = `
@ -28,7 +28,7 @@ test('it looks up values in the config using dot notation', () => {
test('quotes are optional around the lookup path', () => {
const input = `
.banana { color: config(theme.colors.yellow); }
.banana { color: theme(colors.yellow); }
`
const output = `
@ -49,7 +49,7 @@ test('quotes are optional around the lookup path', () => {
test('a default value can be provided', () => {
const input = `
.cookieMonster { color: config('theme.colors.blue', #0000ff); }
.cookieMonster { color: theme('colors.blue', #0000ff); }
`
const output = `
@ -70,7 +70,7 @@ test('a default value can be provided', () => {
test('quotes are preserved around default values', () => {
const input = `
.heading { font-family: config('theme.fonts.sans', "Helvetica Neue"); }
.heading { font-family: theme('fonts.sans', "Helvetica Neue"); }
`
const output = `

4
src/lib/evaluateTailwindFunctions.js
View File

@ -4,8 +4,8 @@ import functions from 'postcss-functions'
export default function(config) {
return functions({
functions: {
config: (path, defaultValue) => {
return _.get(config, _.trim(path, `'"`), defaultValue)
theme: (path, defaultValue) => {
return _.get(config.theme, _.trim(path, `'"`), defaultValue)
},
},
})

2
src/plugins/css/preflight.css
View File

@ -89,7 +89,7 @@ ul {
*::after {
border-width: 0;
border-style: solid;
border-color: config('theme.borderColor.default', currentColor);
border-color: theme('borderColor.default', currentColor);
}
/**