diff --git a/src/plugins/backgroundColor.js b/src/plugins/backgroundColor.js index b9f443c0c..d9a19dc52 100644 --- a/src/plugins/backgroundColor.js +++ b/src/plugins/backgroundColor.js @@ -4,9 +4,11 @@ import withAlphaVariable from '../util/withAlphaVariable' export default function() { return function({ addUtilities, e, theme, variants, target, corePlugins }) { + const colors = flattenColorPalette(theme('backgroundColor')) + if (target('backgroundColor') === 'ie11') { const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('backgroundColor')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [`.${e(`bg-${modifier}`)}`, { 'background-color': value }] }) ) @@ -17,7 +19,7 @@ export default function() { } const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('backgroundColor')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [ `.${e(`bg-${modifier}`)}`, corePlugins('backgroundOpacity') diff --git a/src/plugins/borderColor.js b/src/plugins/borderColor.js index 175b83b25..c87001768 100644 --- a/src/plugins/borderColor.js +++ b/src/plugins/borderColor.js @@ -4,9 +4,9 @@ import withAlphaVariable from '../util/withAlphaVariable' export default function() { return function({ addUtilities, e, theme, variants, target, corePlugins }) { - if (target('borderColor') === 'ie11') { - const colors = flattenColorPalette(theme('borderColor')) + const colors = flattenColorPalette(theme('borderColor')) + if (target('borderColor') === 'ie11') { const utilities = _.fromPairs( _.map(_.omit(colors, 'default'), (value, modifier) => { return [`.${e(`border-${modifier}`)}`, { 'border-color': value }] @@ -18,8 +18,6 @@ export default function() { return } - const colors = flattenColorPalette(theme('borderColor')) - const utilities = _.fromPairs( _.map(_.omit(colors, 'default'), (value, modifier) => { return [ diff --git a/src/plugins/fill.js b/src/plugins/fill.js index 93b6804e3..3540301cd 100644 --- a/src/plugins/fill.js +++ b/src/plugins/fill.js @@ -3,8 +3,10 @@ import flattenColorPalette from '../util/flattenColorPalette' export default function() { return function({ addUtilities, e, theme, variants }) { + const colors = flattenColorPalette(theme('fill')) + const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('fill')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [ `.${e(`fill-${modifier}`)}`, { diff --git a/src/plugins/placeholderColor.js b/src/plugins/placeholderColor.js index a7e0e9194..9497af0e4 100644 --- a/src/plugins/placeholderColor.js +++ b/src/plugins/placeholderColor.js @@ -4,9 +4,11 @@ import withAlphaVariable from '../util/withAlphaVariable' export default function() { return function({ addUtilities, e, theme, variants, target, corePlugins }) { + const colors = flattenColorPalette(theme('placeholderColor')) + if (target('placeholderColor') === 'ie11') { const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('placeholderColor')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [`.${e(`placeholder-${modifier}`)}::placeholder`, { color: value }] }) ) @@ -17,7 +19,7 @@ export default function() { } const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('placeholderColor')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [ `.${e(`placeholder-${modifier}`)}::placeholder`, corePlugins('placeholderOpacity') diff --git a/src/plugins/stroke.js b/src/plugins/stroke.js index 0dd862a29..7f460a72a 100644 --- a/src/plugins/stroke.js +++ b/src/plugins/stroke.js @@ -3,8 +3,10 @@ import flattenColorPalette from '../util/flattenColorPalette' export default function() { return function({ addUtilities, e, theme, variants }) { + const colors = flattenColorPalette(theme('stroke')) + const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('stroke')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [ `.${e(`stroke-${modifier}`)}`, { diff --git a/src/plugins/textColor.js b/src/plugins/textColor.js index 89f8e0aa0..7a05d52c5 100644 --- a/src/plugins/textColor.js +++ b/src/plugins/textColor.js @@ -4,9 +4,11 @@ import withAlphaVariable from '../util/withAlphaVariable' export default function() { return function({ addUtilities, e, theme, variants, target, corePlugins }) { + const colors = flattenColorPalette(theme('textColor')) + if (target('textColor') === 'ie11') { const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('textColor')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [`.${e(`text-${modifier}`)}`, { color: value }] }) ) @@ -17,7 +19,7 @@ export default function() { } const utilities = _.fromPairs( - _.map(flattenColorPalette(theme('textColor')), (value, modifier) => { + _.map(colors, (value, modifier) => { return [ `.${e(`text-${modifier}`)}`, corePlugins('textOpacity')