Fix conflicts

This commit is contained in:
Adam Wathan 2019-02-07 09:10:20 -05:00
commit f69e02cf2f
2 changed files with 41 additions and 14 deletions

View file

@ -1,18 +1,18 @@
import _ from 'lodash'
export default function() {
return function({ addUtilities, config }) {
addUtilities(
{
'.bg-bottom': { 'background-position': 'bottom' },
'.bg-center': { 'background-position': 'center' },
'.bg-left': { 'background-position': 'left' },
'.bg-left-bottom': { 'background-position': 'left bottom' },
'.bg-left-top': { 'background-position': 'left top' },
'.bg-right': { 'background-position': 'right' },
'.bg-right-bottom': { 'background-position': 'right bottom' },
'.bg-right-top': { 'background-position': 'right top' },
'.bg-top': { 'background-position': 'top' },
},
config('modules.backgroundPosition')
return function({ addUtilities, config, e }) {
const utilities = _.fromPairs(
_.map(config('backgroundPosition'), (value, modifier) => {
return [
`.${e(`bg-${modifier}`)}`,
{
'background-position': value,
},
]
})
)
addUtilities(utilities, config('modules.backgroundPosition'))
}
}