wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'master' into 0.3

Browse source
This commit is contained in:
Adam Wathan 2017-11-29 18:46:08 -05:00
commit 45c1c4826f
15 changed files with 99 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/evaluateTailwindFunctions.js
View file

@ -2,12 +2,10 @@ import _ from 'lodash'
import functions from 'postcss-functions'
export default function(config) {
const options = config()
return functions({
functions: {
config: (path, defaultValue) => {
return _.get(options, _.trim(path, `'"`), defaultValue)
return _.get(config(), _.trim(path, `'"`), defaultValue)
},
},
})

2
src/lib/substituteClassApplyAtRules.js
View file

@ -24,7 +24,7 @@ function findMixin(css, mixin, onError) {
if (_.isEmpty(matches)) {
// prettier-ignore
onError(`\`@apply\` cannot be used with ${mixin} because ${mixin} either does not exist, or it's actual definition includes a pseudo-class like :hover, :active, etc.`)
onError(`\`@apply\` cannot be used with \`${mixin}\` because \`${mixin}\` either cannot be found, or it's actual definition includes a pseudo-selector like :hover, :active, etc. If you're sure that \`${mixin}\` exists, make sure that any \`@import\` statements are being properly processed *before* Tailwind CSS sees your CSS, as \`@apply\` can only be used for classes in the same CSS tree.`)
}
if (matches.length > 1) {