Skip to content
Permalink
Browse files

fix #1593 -- bootstrap 3.3.2

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Jan 19, 2015
1 parent 3777ba1 commit 3ba8ebeb142592aed52a6b279f2472ba5ef8a8b0
Showing with 2,423 additions and 1,215 deletions.
  1. +2 −2 bower.json
  2. +4 −4 bower_components/bootstrap/.bower.json
  3. +45 −8 bower_components/bootstrap/Gruntfile.js
  4. +1 −1 bower_components/bootstrap/LICENSE
  5. +12 −9 bower_components/bootstrap/README.md
  6. +1 −1 bower_components/bootstrap/bower.json
  7. +8 −2 bower_components/bootstrap/dist/css/bootstrap-theme.css
  8. +1 −1 bower_components/bootstrap/dist/css/bootstrap-theme.css.map
  9. +3 −3 bower_components/bootstrap/dist/css/bootstrap-theme.min.css
  10. +257 −23 bower_components/bootstrap/dist/css/bootstrap.css
  11. +1 −1 bower_components/bootstrap/dist/css/bootstrap.css.map
  12. +3 −3 bower_components/bootstrap/dist/css/bootstrap.min.css
  13. BIN bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
  14. +273 −214 bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
  15. BIN bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
  16. BIN bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
  17. +55 −69 bower_components/bootstrap/dist/js/bootstrap.js
  18. +4 −4 bower_components/bootstrap/dist/js/bootstrap.min.js
  19. BIN bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot
  20. +273 −214 bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg
  21. BIN bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf
  22. BIN bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff
  23. +1 −0 bower_components/bootstrap/grunt/configBridge.json
  24. +4 −4 bower_components/bootstrap/grunt/sauce_browsers.yml
  25. +2 −0 bower_components/bootstrap/js/.jscsrc
  26. +4 −4 bower_components/bootstrap/js/affix.js
  27. +3 −3 bower_components/bootstrap/js/alert.js
  28. +3 −3 bower_components/bootstrap/js/button.js
  29. +7 −10 bower_components/bootstrap/js/carousel.js
  30. +4 −4 bower_components/bootstrap/js/collapse.js
  31. +3 −3 bower_components/bootstrap/js/dropdown.js
  32. +3 −3 bower_components/bootstrap/js/modal.js
  33. +7 −13 bower_components/bootstrap/js/popover.js
  34. +3 −3 bower_components/bootstrap/js/scrollspy.js
  35. +3 −3 bower_components/bootstrap/js/tab.js
  36. +10 −16 bower_components/bootstrap/js/tooltip.js
  37. +2 −2 bower_components/bootstrap/js/transition.js
  38. +5 −0 bower_components/bootstrap/less/alerts.less
  39. +4 −0 bower_components/bootstrap/less/badges.less
  40. +2 −2 bower_components/bootstrap/less/button-groups.less
  41. +1 −1 bower_components/bootstrap/less/buttons.less
  42. +8 −6 bower_components/bootstrap/less/carousel.less
  43. +1 −0 bower_components/bootstrap/less/close.less
  44. +2 −1 bower_components/bootstrap/less/dropdowns.less
  45. +41 −21 bower_components/bootstrap/less/forms.less
  46. +67 −0 bower_components/bootstrap/less/glyphicons.less
  47. +1 −0 bower_components/bootstrap/less/jumbotron.less
  48. +14 −0 bower_components/bootstrap/less/media.less
  49. +1 −1 bower_components/bootstrap/less/mixins/vendor-prefixes.less
  50. +1 −0 bower_components/bootstrap/less/navbar.less
  51. +5 −1 bower_components/bootstrap/less/panels.less
  52. +1 −1 bower_components/bootstrap/less/popovers.less
  53. +3 −3 bower_components/bootstrap/less/tables.less
  54. +3 −2 bower_components/bootstrap/less/theme.less
  55. +1 −1 bower_components/bootstrap/less/tooltip.less
  56. +3 −2 bower_components/bootstrap/less/variables.less
  57. +14 −13 bower_components/bootstrap/package.json
  58. +5 −5 bower_components/jquery/.bower.json
  59. +2 −2 bower_components/jquery/bower.json
  60. +113 −75 bower_components/jquery/dist/jquery.js
  61. +4 −4 bower_components/jquery/dist/jquery.min.js
  62. +1 −1 bower_components/jquery/dist/jquery.min.map
  63. +2 −8 bower_components/jquery/src/ajax.js
  64. +3 −2 bower_components/jquery/src/ajax/xhr.js
  65. +2 −1 bower_components/jquery/src/core.js
  66. +8 −1 bower_components/jquery/src/css/curCSS.js
  67. +2 −0 bower_components/jquery/src/css/support.js
  68. +1 −0 bower_components/jquery/src/jquery.js
  69. +83 −60 bower_components/jquery/src/sizzle/dist/sizzle.js
  70. +3 −3 bower_components/jquery/src/sizzle/dist/sizzle.min.js
  71. +1 −1 bower_components/jquery/src/sizzle/dist/sizzle.min.map
  72. +1 −0 bower_components/jquery/src/wrap.js
  73. +5 −6 bower_components/moment/.bower.json
  74. +12 −0 bower_components/moment/CHANGELOG.md
  75. +1 −1 bower_components/moment/bower.json
  76. +3 −1 bower_components/moment/locale/af.js
  77. +2 −1 bower_components/moment/locale/ar-ma.js
  78. +3 −2 bower_components/moment/locale/ar-sa.js
  79. +3 −2 bower_components/moment/locale/ar.js
  80. +3 −1 bower_components/moment/locale/az.js
  81. +3 −1 bower_components/moment/locale/be.js
  82. +3 −1 bower_components/moment/locale/bg.js
  83. +2 −1 bower_components/moment/locale/bn.js
  84. +2 −1 bower_components/moment/locale/bo.js
  85. +3 −1 bower_components/moment/locale/br.js
  86. +5 −3 bower_components/moment/locale/bs.js
  87. +13 −2 bower_components/moment/locale/ca.js
  88. +4 −2 bower_components/moment/locale/cs.js
  89. +3 −1 bower_components/moment/locale/cv.js
  90. +3 −1 bower_components/moment/locale/cy.js
  91. +3 −1 bower_components/moment/locale/da.js
  92. +9 −7 bower_components/moment/locale/de-at.js
  93. +9 −7 bower_components/moment/locale/de.js
  94. +5 −5 bower_components/moment/locale/el.js
  95. +3 −1 bower_components/moment/locale/en-au.js
  96. +3 −1 bower_components/moment/locale/en-ca.js
  97. +3 −1 bower_components/moment/locale/en-gb.js
  98. +3 −1 bower_components/moment/locale/eo.js
  99. +3 −1 bower_components/moment/locale/es.js
  100. +3 −1 bower_components/moment/locale/et.js
  101. +3 −1 bower_components/moment/locale/eu.js
  102. +3 −1 bower_components/moment/locale/fa.js
  103. +3 −1 bower_components/moment/locale/fi.js
  104. +3 −1 bower_components/moment/locale/fo.js
  105. +3 −1 bower_components/moment/locale/fr-ca.js
  106. +3 −1 bower_components/moment/locale/fr.js
  107. +3 −1 bower_components/moment/locale/gl.js
  108. +2 −1 bower_components/moment/locale/he.js
  109. +2 −1 bower_components/moment/locale/hi.js
  110. +3 −1 bower_components/moment/locale/hr.js
  111. +3 −1 bower_components/moment/locale/hu.js
  112. +3 −1 bower_components/moment/locale/hy-am.js
  113. +2 −1 bower_components/moment/locale/id.js
  114. +3 −1 bower_components/moment/locale/is.js
  115. +11 −2 bower_components/moment/locale/it.js
  116. +2 −1 bower_components/moment/locale/ja.js
  117. +3 −1 bower_components/moment/locale/ka.js
  118. +2 −1 bower_components/moment/locale/km.js
  119. +3 −1 bower_components/moment/locale/ko.js
  120. +3 −1 bower_components/moment/locale/lb.js
  121. +3 −1 bower_components/moment/locale/lt.js
  122. +3 −1 bower_components/moment/locale/lv.js
  123. +3 −1 bower_components/moment/locale/mk.js
  124. +2 −1 bower_components/moment/locale/ml.js
  125. +2 −1 bower_components/moment/locale/mr.js
  126. +2 −1 bower_components/moment/locale/ms-my.js
  127. +2 −1 bower_components/moment/locale/my.js
  128. +3 −1 bower_components/moment/locale/nb.js
  129. +2 −1 bower_components/moment/locale/ne.js
  130. +3 −1 bower_components/moment/locale/nl.js
  131. +3 −1 bower_components/moment/locale/nn.js
  132. +3 −1 bower_components/moment/locale/pl.js
  133. +3 −1 bower_components/moment/locale/pt-br.js
  134. +3 −1 bower_components/moment/locale/pt.js
  135. +2 −1 bower_components/moment/locale/ro.js
  136. +25 −15 bower_components/moment/locale/ru.js
  137. +3 −1 bower_components/moment/locale/sk.js
  138. +3 −1 bower_components/moment/locale/sl.js
  139. +3 −1 bower_components/moment/locale/sq.js
  140. +3 −1 bower_components/moment/locale/sr-cyrl.js
  141. +3 −1 bower_components/moment/locale/sr.js
  142. +3 −1 bower_components/moment/locale/sv.js
  143. +3 −1 bower_components/moment/locale/ta.js
  144. +2 −1 bower_components/moment/locale/th.js
  145. +3 −1 bower_components/moment/locale/tl-ph.js
  146. +3 −1 bower_components/moment/locale/tr.js
  147. +2 −1 bower_components/moment/locale/tzm-latn.js
  148. +2 −1 bower_components/moment/locale/tzm.js
  149. +3 −1 bower_components/moment/locale/uk.js
  150. +2 −1 bower_components/moment/locale/uz.js
  151. +3 −1 bower_components/moment/locale/vi.js
  152. +3 −1 bower_components/moment/locale/zh-cn.js
  153. +3 −1 bower_components/moment/locale/zh-tw.js
  154. +273 −115 bower_components/moment/min/locales.js
  155. +4 −4 bower_components/moment/min/locales.min.js
  156. +309 −71 bower_components/moment/min/moment-with-locales.js
  157. +6 −6 bower_components/moment/min/moment-with-locales.min.js
  158. +3 −3 bower_components/moment/min/moment.min.js
  159. +114 −34 bower_components/moment/moment.js
  160. +6 −6 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  161. +6 −6 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -9,9 +9,9 @@
"license": "MIT",
"private": true,
"dependencies": {
"bootstrap": "~3.3.0",
"bootstrap": "~3.3.2",
"jquery": "<2.0.0",
"jquery-colorbox": "~1.5.14",
"moment": "~2.8.3"
"moment": "~2.8.4"
}
}
@@ -1,7 +1,7 @@
{
"name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.3.1",
"version": "3.3.2",
"keywords": [
"css",
"js",
@@ -35,11 +35,11 @@
"dependencies": {
"jquery": ">= 1.9.1"
},
"_release": "3.3.1",
"_release": "3.3.2",
"_resolution": {
"type": "version",
"tag": "v3.3.1",
"commit": "9a7e365c2c4360335d25246dac11afb1f577210a"
"tag": "v3.3.2",
"commit": "bcf7dd38b5ab180256e2e4fb5da0369551b3f082"
},
"_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.3.0",
@@ -1,7 +1,7 @@
/*!
* Bootstrap's Gruntfile
* http://getbootstrap.com
* Copyright 2013-2014 Twitter, Inc.
* Copyright 2013-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

@@ -18,6 +18,7 @@ module.exports = function (grunt) {
var fs = require('fs');
var path = require('path');
var npmShrinkwrap = require('npm-shrinkwrap');
var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
var getLessVarsData = function () {
var filePath = path.join(__dirname, 'less/variables.less');
@@ -224,7 +225,7 @@ module.exports = function (grunt) {
options: {
compatibility: 'ie8',
keepSpecialComments: '*',
noAdvanced: true
advanced: false
},
minifyCore: {
src: 'dist/css/<%= pkg.name %>.css',
@@ -296,7 +297,15 @@ module.exports = function (grunt) {
},

jekyll: {
docs: {}
options: {
config: '_config.yml'
},
docs: {},
github: {
options: {
raw: 'github: true'
}
}
},

jade: {
@@ -323,7 +332,8 @@ module.exports = function (grunt) {
relaxerror: [
'Element img is missing required attribute src.',
'Attribute autocomplete not allowed on element input at this point.',
'Attribute autocomplete not allowed on element button at this point.'
'Attribute autocomplete not allowed on element button at this point.',
'Bad value separator for attribute role on element li.'
]
},
files: {
@@ -361,8 +371,9 @@ module.exports = function (grunt) {
all: {
options: {
build: process.env.TRAVIS_JOB_ID,
concurrency: 10,
throttled: 10,
maxRetries: 3,
maxPollRetries: 4,
urls: ['http://127.0.0.1:3000/js/tests/index.html'],
browsers: grunt.file.readYAML('grunt/sauce_browsers.yml')
}
@@ -373,7 +384,27 @@ module.exports = function (grunt) {
npmUpdate: {
command: 'npm update'
}
},

compress: {
main: {
options: {
archive: 'bootstrap-<%= pkg.version %>-dist.zip',
mode: 'zip',
level: 9,
pretty: true
},
files: [
{
expand: true,
cwd: 'dist/',
src: ['**'],
dest: 'bootstrap-<%= pkg.version %>-dist'
}
]
}
}

});


@@ -382,7 +413,7 @@ module.exports = function (grunt) {
require('time-grunt')(grunt);

// Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll', 'validation']);
grunt.registerTask('validate-html', ['jekyll:docs', 'validation']);

var runSubset = function (subset) {
return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset;
@@ -394,7 +425,9 @@ module.exports = function (grunt) {
// Test task.
var testSubtasks = [];
// Skip core tests if running a different subset of the test suite
if (runSubset('core')) {
if (runSubset('core') &&
// Skip core tests if this is a Savage build
process.env.TRAVIS_REPO_SLUG !== 'twbs-savage/bootstrap') {
testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'csslint:dist', 'test-js', 'docs']);
}
// Skip HTML validation if running a different subset of the test suite
@@ -433,6 +466,8 @@ module.exports = function (grunt) {
// This can be overzealous, so its changes should always be manually reviewed!
grunt.registerTask('change-version-number', 'sed');

grunt.registerTask('build-glyphicons-data', function () { generateGlyphiconsData.call(this, grunt); });

// task for building customizer
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
grunt.registerTask('build-customizer-html', 'jade');
@@ -452,7 +487,9 @@ module.exports = function (grunt) {
grunt.registerTask('lint-docs-css', ['csslint:docs', 'csslint:examples']);
grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']);
grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']);
grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-customizer']);
grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']);

grunt.registerTask('prep-release', ['jekyll:github', 'compress']);

// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2011-2014 Twitter, Inc
Copyright (c) 2011-2015 Twitter, Inc

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -1,11 +1,11 @@
# [Bootstrap](http://getbootstrap.com)
[![Bower version](https://badge.fury.io/bo/bootstrap.svg)](http://badge.fury.io/bo/bootstrap)
[![NPM version](https://badge.fury.io/js/bootstrap.svg)](http://badge.fury.io/js/bootstrap)
[![Build Status](https://secure.travis-ci.org/twbs/bootstrap.svg?branch=master)](https://travis-ci.org/twbs/bootstrap)
[![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
![Bower version](https://img.shields.io/bower/v/bootstrap.svg?style=flat)
[![npm version](https://img.shields.io/npm/v/bootstrap.svg?style=flat)](https://www.npmjs.com/package/bootstrap)
[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg?style=flat)](https://travis-ci.org/twbs/bootstrap)
[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg?style=flat)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)

Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community.
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community.

To get started, check out <http://getbootstrap.com>!

@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!

Four quick start options are available:

- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.1.zip).
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.2.zip).
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
- Install with [Bower](http://bower.io): `bower install bootstrap`.
- Install with [npm](https://www.npmjs.org): `npm install bootstrap`.
@@ -39,8 +39,10 @@ Within the download you'll find the following directories and files, logically g
bootstrap/
├── css/
│ ├── bootstrap.css
│ ├── bootstrap.css.map
│ ├── bootstrap.min.css
│ ├── bootstrap-theme.css
│ ├── bootstrap-theme.css.map
│ └── bootstrap-theme.min.css
├── js/
│ ├── bootstrap.js
@@ -49,10 +51,11 @@ bootstrap/
├── glyphicons-halflings-regular.eot
├── glyphicons-halflings-regular.svg
├── glyphicons-halflings-regular.ttf
└── glyphicons-halflings-regular.woff
├── glyphicons-halflings-regular.woff
└── glyphicons-halflings-regular.woff2
```

We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). Fonts from Glyphicons are included, as is the optional Bootstrap theme.
We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/chrome-developer-tools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.



@@ -126,4 +129,4 @@ For transparency into our release cycle and in striving to maintain backward com

## Copyright and license

Code and documentation copyright 2011-2014 Twitter, Inc. Code released under [the MIT license](LICENSE). Docs released under [Creative Commons](docs/LICENSE).
Code and documentation copyright 2011-2015 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
@@ -1,7 +1,7 @@
{
"name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.3.1",
"version": "3.3.2",
"keywords": [
"css",
"js",

Some generated files are not rendered by default. Learn more.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 3ba8ebe

Please sign in to comment.
You can’t perform that action at this time.