Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gruntfile.js5
-rw-r--r--docs/assets/js/src/customizer.js2
-rw-r--r--grunt/configBridge.json23
3 files changed, 15 insertions, 15 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 10b0bb2c61..c7bfac58f5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -193,10 +193,7 @@ module.exports = function (grunt) {
sourcesContent: true
},
processors: [
- require('autoprefixer')({
- browsers: configBridge.config.autoprefixerBrowsers,
- cascade: false
- })
+ require('autoprefixer')(configBridge.config.autoprefixer)
]
},
core: {
diff --git a/docs/assets/js/src/customizer.js b/docs/assets/js/src/customizer.js
index 1b59a4425e..da289995d3 100644
--- a/docs/assets/js/src/customizer.js
+++ b/docs/assets/js/src/customizer.js
@@ -245,7 +245,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
var bsLessSource = preamble + generateLESS('bootstrap.less', lessFileIncludes, vars)
var themeLessSource = preamble + generateLESS('theme.less', lessFileIncludes, vars)
- var prefixer = autoprefixer({ browsers: __configBridge.autoprefixerBrowsers })
+ var prefixer = autoprefixer(__configBridge.autoprefixer)
$.when(
compileLESS(bsLessSource, 'bootstrap', result),
diff --git a/grunt/configBridge.json b/grunt/configBridge.json
index 943ed237ef..ada42a7b71 100644
--- a/grunt/configBridge.json
+++ b/grunt/configBridge.json
@@ -23,16 +23,19 @@
]
},
"config": {
- "autoprefixerBrowsers": [
- "Android 2.3",
- "Android >= 4",
- "Chrome >= 20",
- "Firefox >= 24",
- "Explorer >= 8",
- "iOS >= 6",
- "Opera >= 12",
- "Safari >= 6"
- ],
+ "autoprefixer": {
+ "browsers": [
+ "Android 2.3",
+ "Android >= 4",
+ "Chrome >= 20",
+ "Firefox >= 24",
+ "Explorer >= 8",
+ "iOS >= 6",
+ "Opera >= 12",
+ "Safari >= 6"
+ ],
+ "cascade": false
+ },
"jqueryCheck": [
"if (typeof jQuery === 'undefined') {",
" throw new Error('Bootstrap\\'s JavaScript requires jQuery')",