root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #18670 from twbs/unnest-autoprefixer-settings 

Un-nest Autoprefixer settings in module object
This commit is contained in:
Chris Rebert 2015-12-24 22:17:22 -07:00
parent c9d86ff3a3 b0ab6bbf05
commit 4258fb7992
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -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' });

2
grunt/autoprefixer-settings.js
View File

@ -1,5 +1,4 @@
module.exports = { module.exports = {
settings: {
browsers: [ browsers: [
// //
// Official browser support policy: // Official browser support policy:
@ -29,5 +28,4 @@ module.exports = {
'Android >= 4', 'Android >= 4',
'Opera >= 12' 'Opera >= 12'
] ]
}
} }