Skip to content
Permalink
Browse files
bootstrap v3.3.4
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Mar 16, 2015
1 parent c51801f commit 9f51044abb1e907d8c0cbcdcab149416f7fa8ade
Showing with 411 additions and 306 deletions.
  1. +1 −0 CHANGES.txt
  2. +6 −5 bower_components/bootstrap/.bower.json
  3. +22 −20 bower_components/bootstrap/Gruntfile.js
  4. +7 −5 bower_components/bootstrap/README.md
  5. +3 −2 bower_components/bootstrap/bower.json
  6. +1 −1 bower_components/bootstrap/dist/css/bootstrap-theme.css
  7. +1 −1 bower_components/bootstrap/dist/css/bootstrap-theme.min.css
  8. +33 −15 bower_components/bootstrap/dist/css/bootstrap.css
  9. +1 −1 bower_components/bootstrap/dist/css/bootstrap.css.map
  10. +2 −2 bower_components/bootstrap/dist/css/bootstrap.min.css
  11. +108 −97 bower_components/bootstrap/dist/js/bootstrap.js
  12. +3 −3 bower_components/bootstrap/dist/js/bootstrap.min.js
  13. +2 −2 bower_components/bootstrap/grunt/bs-lessdoc-parser.js
  14. +1 −0 bower_components/bootstrap/grunt/configBridge.json
  15. +1 −1 bower_components/bootstrap/grunt/sauce_browsers.yml
  16. +5 −5 bower_components/bootstrap/js/affix.js
  17. +2 −2 bower_components/bootstrap/js/alert.js
  18. +2 −2 bower_components/bootstrap/js/button.js
  19. +6 −6 bower_components/bootstrap/js/carousel.js
  20. +7 −7 bower_components/bootstrap/js/collapse.js
  21. +3 −3 bower_components/bootstrap/js/dropdown.js
  22. +41 −26 bower_components/bootstrap/js/modal.js
  23. +3 −8 bower_components/bootstrap/js/popover.js
  24. +17 −20 bower_components/bootstrap/js/scrollspy.js
  25. +3 −3 bower_components/bootstrap/js/tab.js
  26. +17 −13 bower_components/bootstrap/js/tooltip.js
  27. +1 −1 bower_components/bootstrap/js/transition.js
  28. +2 −2 bower_components/bootstrap/less/alerts.less
  29. +6 −5 bower_components/bootstrap/less/badges.less
  30. +1 −2 bower_components/bootstrap/less/component-animations.less
  31. +1 −1 bower_components/bootstrap/less/dropdowns.less
  32. +10 −2 bower_components/bootstrap/less/forms.less
  33. +4 −0 bower_components/bootstrap/less/glyphicons.less
  34. +1 −1 bower_components/bootstrap/less/jumbotron.less
  35. +3 −1 bower_components/bootstrap/less/modals.less
  36. +0 −1 bower_components/bootstrap/less/navbar.less
  37. +0 −2 bower_components/bootstrap/less/navs.less
  38. +8 −8 bower_components/bootstrap/less/responsive-embed.less
  39. +12 −0 bower_components/bootstrap/less/scaffolding.less
  40. +0 −1 bower_components/bootstrap/less/tooltip.less
  41. +1 −1 bower_components/bootstrap/less/type.less
  42. +0 −1 bower_components/bootstrap/less/utilities.less
  43. +5 −1 bower_components/bootstrap/less/variables.less
  44. +22 −0 bower_components/bootstrap/package.js
  45. +28 −18 bower_components/bootstrap/package.json
  46. +4 −4 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  47. +4 −4 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -10,6 +10,7 @@ Features
Bugfixes
--------

* Update Bootstrap to v3.3.4
* Update jquery-colorbox
* Fix symlinks for moment.js in Windows
* Fix code.css bundling in Windows
@@ -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.2",
"version": "3.3.4",
"keywords": [
"css",
"js",
@@ -20,7 +20,8 @@
"dist/fonts/glyphicons-halflings-regular.eot",
"dist/fonts/glyphicons-halflings-regular.svg",
"dist/fonts/glyphicons-halflings-regular.ttf",
"dist/fonts/glyphicons-halflings-regular.woff"
"dist/fonts/glyphicons-halflings-regular.woff",
"dist/fonts/glyphicons-halflings-regular.woff2"
],
"ignore": [
"/.*",
@@ -35,11 +36,11 @@
"dependencies": {
"jquery": ">= 1.9.1"
},
"_release": "3.3.2",
"_release": "3.3.4",
"_resolution": {
"type": "version",
"tag": "v3.3.2",
"commit": "bcf7dd38b5ab180256e2e4fb5da0369551b3f082"
"tag": "v3.3.4",
"commit": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f"
},
"_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.3.2",
@@ -191,7 +191,7 @@ module.exports = function (grunt) {
src: 'dist/css/<%= pkg.name %>-theme.css'
},
docs: {
src: 'docs/assets/css/src/docs.css'
src: ['docs/assets/css/anchor.css', 'docs/assets/css/src/docs.css']
},
examples: {
expand: true,
@@ -223,6 +223,8 @@ module.exports = function (grunt) {

cssmin: {
options: {
// TODO: disable `zeroUnits` optimization once clean-css 3.2 is released
// and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
compatibility: 'ie8',
keepSpecialComments: '*',
advanced: false
@@ -237,8 +239,10 @@ module.exports = function (grunt) {
},
docs: {
src: [
'docs/assets/css/src/docs.css',
'docs/assets/css/src/pygments-manni.css'
'docs/assets/css/src/pygments-manni.css',
'docs/assets/css/src/anchor.css',
'docs/assets/css/src/docs.css'

],
dest: 'docs/assets/css/docs.min.css'
}
@@ -278,12 +282,17 @@ module.exports = function (grunt) {

copy: {
fonts: {
expand: true,
src: 'fonts/*',
dest: 'dist/'
},
docs: {
src: 'dist/*/*',
dest: 'docs/'
expand: true,
cwd: 'dist/',
src: [
'**/*'
],
dest: 'docs/dist/'
}
},

@@ -323,22 +332,15 @@ module.exports = function (grunt) {
}
},

validation: {
htmllint: {
options: {
charset: 'utf-8',
doctype: 'HTML5',
failHard: true,
reset: true,
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.',
'Bad value separator for attribute role on element li.'
ignore: [
'Attribute "autocomplete" not allowed on element "button" at this point.',
'Attribute "autocomplete" not allowed on element "input" at this point.',
'Element "img" is missing required attribute "src".'
]
},
files: {
src: '_gh_pages/**/*.html'
}
src: '_gh_pages/**/*.html'
},

watch: {
@@ -374,7 +376,7 @@ module.exports = function (grunt) {
throttled: 10,
maxRetries: 3,
maxPollRetries: 4,
urls: ['http://127.0.0.1:3000/js/tests/index.html'],
urls: ['http://127.0.0.1:3000/js/tests/index.html?hidepassed'],
browsers: grunt.file.readYAML('grunt/sauce_browsers.yml')
}
}
@@ -413,7 +415,7 @@ module.exports = function (grunt) {
require('time-grunt')(grunt);

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

var runSubset = function (subset) {
return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset;
@@ -22,12 +22,13 @@ To get started, check out <http://getbootstrap.com>!

## Quick start

Four quick start options are available:
Five quick start options are available:

- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.2.zip).
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.4.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`.
- Install with [npm](https://www.npmjs.com): `npm install bootstrap`.
- Install with [Meteor](https://www.meteor.com/): `meteor add twbs:bootstrap`.

Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.

@@ -90,7 +91,7 @@ Documentation for v2.3.2 has been made available for the time being at <http://g

Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).

Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.

@@ -100,10 +101,11 @@ Editor preferences are available in the [editor config](https://github.com/twbs/

Keep track of development and community news.

- Follow [@twbootstrap on Twitter](https://twitter.com/twbootstrap).
- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.



@@ -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.2",
"version": "3.3.4",
"keywords": [
"css",
"js",
@@ -20,7 +20,8 @@
"dist/fonts/glyphicons-halflings-regular.eot",
"dist/fonts/glyphicons-halflings-regular.svg",
"dist/fonts/glyphicons-halflings-regular.ttf",
"dist/fonts/glyphicons-halflings-regular.woff"
"dist/fonts/glyphicons-halflings-regular.woff",
"dist/fonts/glyphicons-halflings-regular.woff2"
],
"ignore": [
"/.*",

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

0 comments on commit 9f51044

Please sign in to comment.