mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-06 04:08:22 +01:00
Merge pull request #18670 from twbs/unnest-autoprefixer-settings
Un-nest Autoprefixer settings in module object
This commit is contained in:
commit
4258fb7992
@ -22,7 +22,7 @@ module.exports = function (grunt) {
|
|||||||
var npmShrinkwrap = require('npm-shrinkwrap');
|
var npmShrinkwrap = require('npm-shrinkwrap');
|
||||||
var mq4HoverShim = require('mq4-hover-shim');
|
var mq4HoverShim = require('mq4-hover-shim');
|
||||||
var autoprefixerSettings = require('./grunt/autoprefixer-settings.js');
|
var autoprefixerSettings = require('./grunt/autoprefixer-settings.js');
|
||||||
var autoprefixer = require('autoprefixer')(autoprefixerSettings.settings);
|
var autoprefixer = require('autoprefixer')(autoprefixerSettings);
|
||||||
|
|
||||||
var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
|
var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
|
||||||
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' });
|
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' });
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
settings: {
|
|
||||||
browsers: [
|
browsers: [
|
||||||
//
|
//
|
||||||
// Official browser support policy:
|
// Official browser support policy:
|
||||||
@ -30,4 +29,3 @@ module.exports = {
|
|||||||
'Opera >= 12'
|
'Opera >= 12'
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user