diff --git a/.gitignore b/.gitignore index 10c58cf68..465cdb463 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ validation-report.json # Folders to ignore node_modules +bower_components diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 96b7732b0..7c88a8d88 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -59,3 +59,21 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). We're in the process of collecting permissions from all Bootstrap contributors with code still part of the project to make this happen. For details, please see [#2054](https://github.com/twbs/bootstrap/issues/2054). By contributing your code, you agree to dual-license your contribution under the [Apache 2](https://github.com/twbs/bootstrap/blob/master/LICENSE) and [MIT](https://github.com/twbs/bootstrap/blob/master/MIT) licenses. + + + +## Release checklist + +1. Close ship list issue for the release. +2. Close the milestone for the release. +3. Open new release issue that includes this checklist. +4. Ping folks to coordinate release (mainly @jdorfman for BootstrapCDN). +5. Update version numbers using `grunt change-version-number --oldver=A.B.C --newver=X.Y.Z`. Review the changes and stage them manually. +6. Run `grunt` one last time. +7. Push to `master` branch. +8. Merge `master` into `gh-pages`. +9. Generate `bootstrap-X.Y.Z-dist.zip` file for release. +10. Create release on GitHub with `/dist/` folder and release notes. +11. Push `gh-pages`. +12. Publish blog post. +13. Tweet tweet. diff --git a/Gruntfile.js b/Gruntfile.js index c3016a2b0..ebc3abc38 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -135,8 +135,8 @@ module.exports = function(grunt) { options: { reset: true, relaxerror: [ - "Bad value X-UA-Compatible for attribute http-equiv on element meta.", - "Element img is missing required attribute src." + "Bad value X-UA-Compatible for attribute http-equiv on element meta.", + "Element img is missing required attribute src." ] }, files: { diff --git a/bower.json b/bower.json index ed210a01f..bf60a5113 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,28 @@ { "name": "bootstrap", "version": "3.0.2", - "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"], + "main": [ + "./dist/js/bootstrap.js", + "./dist/css/bootstrap.css", + "./dist/fonts/glyphicons-halflings-regular.eot", + "./dist/fonts/glyphicons-halflings-regular.svg", + "./dist/fonts/glyphicons-halflings-regular.ttf", + "./dist/fonts/glyphicons-halflings-regular.woff" + ], "ignore": [ - "**/.*" + "**/.*", + "_*", + "docs-assets", + "examples", + "/fonts", + "js/tests", + "CNAME", + "CONTRIBUTING.md", + "Gruntfile.js", + "browserstack.json", + "composer.json", + "package.json", + "*.html" ], "dependencies": { "jquery": ">= 1.9.0" diff --git a/browserstack.json b/browserstack.json index 76564eb27..104d85476 100644 --- a/browserstack.json +++ b/browserstack.json @@ -2,7 +2,7 @@ "username": "--secure--", "key": "--secure--", "test_path": "js/tests/index.html", - "browsers": [ + "browsers": [ { "browser": "firefox", "browser_version": "latest", diff --git a/components.html b/components.html index 25ed9ea11..41b77f97f 100644 --- a/components.html +++ b/components.html @@ -19,809 +19,813 @@ base_url: "../"

How to use

For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.

+
+

Don't mix with other components

+

Icon classes cannot be combined with other elements. They are designed to be standalone elements.

+
{% highlight html %} {% endhighlight %} @@ -1882,8 +1886,8 @@ base_url: "../"

Easily make tabs or pills equal widths of their parent at screens wider than 768px with .nav-justified. On smaller screens, the nav links are stacked.

-

WebKit and responsive justified navs

-

Chrome and Safari both exhibit a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the justified nav example.

+

Safari and responsive justified navs

+

Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the justified nav example.