Skip to content
Permalink
Browse files

Bootstrap v3.3.6

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Nov 25, 2015
1 parent e0c1126 commit 2a5e50ec2fabf0a8184c4f441aed265ddff46024
Showing with 293 additions and 237 deletions.
  1. +1 −1 bower.json
  2. +6 −6 bower_components/bootstrap/.bower.json
  3. +5 −0 bower_components/bootstrap/CHANGELOG.md
  4. +3 −1 bower_components/bootstrap/Gruntfile.js
  5. +35 −33 bower_components/bootstrap/README.md
  6. +1 −1 bower_components/bootstrap/bower.json
  7. +1 −1 bower_components/bootstrap/dist/css/bootstrap-theme.css
  8. +1 −1 bower_components/bootstrap/dist/css/bootstrap-theme.css.map
  9. +3 −2 bower_components/bootstrap/dist/css/bootstrap-theme.min.css
  10. +1 −0 bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map
  11. +30 −70 bower_components/bootstrap/dist/css/bootstrap.css
  12. +1 −1 bower_components/bootstrap/dist/css/bootstrap.css.map
  13. +3 −2 bower_components/bootstrap/dist/css/bootstrap.min.css
  14. +1 −0 bower_components/bootstrap/dist/css/bootstrap.min.css.map
  15. +28 −28 bower_components/bootstrap/dist/js/bootstrap.js
  16. +3 −3 bower_components/bootstrap/dist/js/bootstrap.min.js
  17. +3 −3 bower_components/bootstrap/grunt/configBridge.json
  18. +2 −2 bower_components/bootstrap/js/affix.js
  19. +2 −2 bower_components/bootstrap/js/alert.js
  20. +2 −2 bower_components/bootstrap/js/button.js
  21. +2 −2 bower_components/bootstrap/js/carousel.js
  22. +2 −2 bower_components/bootstrap/js/collapse.js
  23. +4 −4 bower_components/bootstrap/js/dropdown.js
  24. +2 −2 bower_components/bootstrap/js/modal.js
  25. +2 −2 bower_components/bootstrap/js/popover.js
  26. +2 −2 bower_components/bootstrap/js/scrollspy.js
  27. +2 −2 bower_components/bootstrap/js/tab.js
  28. +2 −2 bower_components/bootstrap/js/tooltip.js
  29. +1 −1 bower_components/bootstrap/js/transition.js
  30. +1 −1 bower_components/bootstrap/less/bootstrap.less
  31. +2 −2 bower_components/bootstrap/less/button-groups.less
  32. +7 −6 bower_components/bootstrap/less/carousel.less
  33. +9 −3 bower_components/bootstrap/less/forms.less
  34. +2 −2 bower_components/bootstrap/less/glyphicons.less
  35. +7 −3 bower_components/bootstrap/less/input-groups.less
  36. +2 −0 bower_components/bootstrap/less/jumbotron.less
  37. +1 −4 bower_components/bootstrap/less/mixins/buttons.less
  38. +2 −2 bower_components/bootstrap/less/mixins/grid.less
  39. +1 −1 bower_components/bootstrap/less/mixins/hide-text.less
  40. +2 −2 bower_components/bootstrap/less/mixins/vendor-prefixes.less
  41. +1 −1 bower_components/bootstrap/less/modals.less
  42. +2 −2 bower_components/bootstrap/less/pagination.less
  43. +1 −1 bower_components/bootstrap/less/theme.less
  44. +1 −1 bower_components/bootstrap/less/type.less
  45. +2 −0 bower_components/bootstrap/less/variables.less
  46. +8 −0 bower_components/bootstrap/nuget/MyGet.ps1
  47. +28 −0 bower_components/bootstrap/nuget/bootstrap.less.nuspec
  48. +28 −0 bower_components/bootstrap/nuget/bootstrap.nuspec
  49. +10 −3 bower_components/bootstrap/package.js
  50. +17 −17 bower_components/bootstrap/package.json
  51. +4 −4 nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
  52. +4 −4 nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -9,7 +9,7 @@
"license": "MIT",
"private": true,
"dependencies": {
"bootstrap": "~3.3.4",
"bootstrap": "~3.3.6",
"jquery": "<2.0.0",
"jquery-colorbox": "~1.6.0",
"moment": "~2.10.3",
@@ -29,16 +29,16 @@
"test-infra"
],
"dependencies": {
"jquery": ">= 1.9.1"
"jquery": "1.9.1 - 2"
},
"version": "3.3.5",
"_release": "3.3.5",
"version": "3.3.6",
"_release": "3.3.6",
"_resolution": {
"type": "version",
"tag": "v3.3.5",
"commit": "16b48259a62f576e52c903c476bd42b90ab22482"
"tag": "v3.3.6",
"commit": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
},
"_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.3.4",
"_target": "~3.3.6",
"_originalSource": "bootstrap"
}
@@ -0,0 +1,5 @@
Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs.

See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap.

Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
@@ -231,6 +231,7 @@ module.exports = function (grunt) {
// and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
compatibility: 'ie8',
keepSpecialComments: '*',
sourceMap: true,
advanced: false
},
minifyCore: {
@@ -243,6 +244,7 @@ module.exports = function (grunt) {
},
docs: {
src: [
'docs/assets/css/ie10-viewport-bug-workaround.css',
'docs/assets/css/src/pygments-manni.css',
'docs/assets/css/src/docs.css'
],
@@ -348,7 +350,7 @@ module.exports = function (grunt) {
options: {
ignore: [
'Attribute "autocomplete" not allowed on element "button" at this point.',
'Attribute "autocomplete" not allowed on element "input" at this point.',
'Attribute "autocomplete" is only allowed when the input type is "color", "date", "datetime", "datetime-local", "email", "month", "number", "password", "range", "search", "tel", "text", "time", "url", or "week".',
'Element "img" is missing required attribute "src".'
]
},
@@ -1,36 +1,40 @@
# [Bootstrap](http://getbootstrap.com)

[![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com)
![Bower version](https://img.shields.io/bower/v/bootstrap.svg)
[![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap)
[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap)
[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![NuGet](https://img.shields.io/nuget/v/bootstrap.svg)](https://www.nuget.org/packages/Bootstrap)
[![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/orgs/twbs/people) with the massive support and involvement of the community.

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


## Table of contents

- [Quick start](#quick-start)
- [Bugs and feature requests](#bugs-and-feature-requests)
- [Documentation](#documentation)
- [Contributing](#contributing)
- [Community](#community)
- [Versioning](#versioning)
- [Creators](#creators)
- [Copyright and license](#copyright-and-license)
* [Quick start](#quick-start)
* [Bugs and feature requests](#bugs-and-feature-requests)
* [Documentation](#documentation)
* [Contributing](#contributing)
* [Community](#community)
* [Versioning](#versioning)
* [Creators](#creators)
* [Copyright and license](#copyright-and-license)


## Quick start

Several quick start options are available:

- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.5.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.com): `npm install bootstrap`.
- Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`.
- Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`.
* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.6.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.com): `npm install bootstrap`.
* Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`.
* Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`.

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

@@ -44,9 +48,11 @@ bootstrap/
│ ├── bootstrap.css
│ ├── bootstrap.css.map
│ ├── bootstrap.min.css
│ ├── bootstrap.min.css.map
│ ├── bootstrap-theme.css
│ ├── bootstrap-theme.css.map
│ └── bootstrap-theme.min.css
│ ├── bootstrap-theme.min.css
│ └── bootstrap-theme.min.css.map
├── js/
│ ├── bootstrap.js
│ └── bootstrap.min.js
@@ -61,7 +67,6 @@ bootstrap/
We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/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.



## Bugs and feature requests

Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).
@@ -73,11 +78,11 @@ Bootstrap's documentation, included in this repo in the root directory, is built

### Running documentation locally

1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x).
- **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v3.0.x).
**Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
4. Open <http://localhost:9001> in your browser, and voilà.
4. Open `http://localhost:9001` in your browser, and voilà.

Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/).

@@ -88,7 +93,6 @@ Documentation for v2.3.2 has been made available for the time being at <http://g
[Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.



## Contributing

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.
@@ -98,38 +102,36 @@ Moreover, if your pull request contains JavaScript patches or features, you must
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>.



## Community

Get updates on Bootstrap's development and chat with the project maintainers and community members.

- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
- Join [the official Slack room](https://bootstrap-slack.herokuapp.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`](https://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.

* Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
* Join [the official Slack room](https://bootstrap-slack.herokuapp.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`](https://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.


## Versioning

For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.

See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.


## Creators

**Mark Otto**

- <https://twitter.com/mdo>
- <https://github.com/mdo>
* <https://twitter.com/mdo>
* <https://github.com/mdo>

**Jacob Thornton**

- <https://twitter.com/fat>
- <https://github.com/fat>

* <https://twitter.com/fat>
* <https://github.com/fat>


## Copyright and license
@@ -29,6 +29,6 @@
"test-infra"
],
"dependencies": {
"jquery": ">= 1.9.1"
"jquery": "1.9.1 - 2"
}
}

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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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

0 comments on commit 2a5e50e

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