Bootstrap 3.3.2 Update

This commit is contained in:
David Miller
2015-01-20 02:49:35 -05:00
parent c86d11faa3
commit bc81e5d799
59 changed files with 1221 additions and 686 deletions

View File

@@ -0,0 +1,41 @@
/*!
* Bootstrap Grunt task for Glyphicons data generation
* http://getbootstrap.com
* Copyright 2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
'use strict';
var fs = require('fs');
module.exports = function generateGlyphiconsData(grunt) {
// Pass encoding, utf8, so `readFileSync` will return a string instead of a
// buffer
var glyphiconsFile = fs.readFileSync('less/glyphicons.less', 'utf8');
var glyphiconsLines = glyphiconsFile.split('\n');
// Use any line that starts with ".glyphicon-" and capture the class name
var iconClassName = /^\.(glyphicon-[a-zA-Z0-9-]+)/;
var glyphiconsData = '# This file is generated via Grunt task. **Do not edit directly.**\n' +
'# See the \'build-glyphicons-data\' task in Gruntfile.js.\n\n';
var glyphiconsYml = 'docs/_data/glyphicons.yml';
for (var i = 0, len = glyphiconsLines.length; i < len; i++) {
var match = glyphiconsLines[i].match(iconClassName);
if (match !== null) {
glyphiconsData += '- ' + match[1] + '\n';
}
}
// Create the `_data` directory if it doesn't already exist
if (!fs.existsSync('docs/_data')) {
fs.mkdirSync('docs/_data');
}
try {
fs.writeFileSync(glyphiconsYml, glyphiconsData);
}
catch (err) {
grunt.fail.warn(err);
}
grunt.log.writeln('File ' + glyphiconsYml.cyan + ' created.');
};

View File

@@ -34,6 +34,7 @@
],
"jqueryVersionCheck": [
"+function ($) {",
" 'use strict';",
" var version = $.fn.jquery.split(' ')[0].split('.')",
" if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {",
" throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')",

View File

@@ -3,15 +3,15 @@
{
browserName: "safari",
platform: "OS X 10.9"
platform: "OS X 10.10"
},
{
browserName: "chrome",
platform: "OS X 10.9"
platform: "OS X 10.10"
},
{
browserName: "firefox",
platform: "OS X 10.9"
platform: "OS X 10.10"
},
# Mac Opera not currently supported by Sauce Labs
@@ -57,7 +57,7 @@
{
browserName: "iphone",
platform: "OS X 10.9",
version: "8.0"
version: "8.1"
},
# iOS Chrome not currently supported by Sauce Labs