diff --git a/.gitignore b/.gitignore index 5c7f051926..392fc39279 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,8 @@ nbproject .komodotools # grunt-html-validation -validation-staus.json +validation-status.json +validation-report.json # Folders to ignore .hg diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 060a3bd91d..2cbd6e32c2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,21 +15,13 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso -## Key branches - -- `master` is the latest, deployed version. -- `gh-pages` is the hosted docs (not to be used for pull requests). -- `*-wip` is the official work in progress branch for the next release. - - - ## Pull requests -- Try to submit pull requests against the latest `*-wip` branch for easier merging -- CSS changes must be done in .less files first, never just the compiled files -- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css +- CSS changes must be done in `.less` files first, never just the compiled `.css` files +- If modifying the `.less` files, always recompile and commit the compiled files `bootstrap.css` and `bootstrap.min.css` - Try not to pollute your pull request with unintended changes--keep them simple and small - Try to share which browsers your code has been tested in before submitting a pull request +- Pull requests should always be against the `master` branch, never against `gh-pages`. diff --git a/README.md b/README.md index 2476456ddc..03f8f3362b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bootstrap v3.0.0](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) +# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). @@ -10,7 +10,7 @@ To get started, check out [http://getbootstrap.com](http://getbootstrap.com)! Three quick start options are available: -* [Download the latest release](https://github.com/twbs/bootstrap/zipball/3.0.0-wip). +* [Download the latest release](https://github.com/twbs/bootstrap/releases/tag/v3.0.0). * Clone the repo: `git clone git://github.com/twbs/bootstrap.git`. * Install with [Bower](http://bower.io): `bower install bootstrap`. @@ -138,4 +138,4 @@ For more information on SemVer, please visit [http://semver.org/](http://semver. ## Copyright and license -Copyright 2012 Twitter, Inc under [the Apache 2.0 license](LICENSE). +Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE). diff --git a/_includes/header.html b/_includes/header.html index 827b1c2c91..433af17f86 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -6,7 +6,7 @@ {% if page.title == "Bootstrap" %} {{ page.title }} - {% else if %} + {% else %} {{ page.title }} · Bootstrap {% endif %} diff --git a/components.html b/components.html index a428529b15..5320efcd63 100644 --- a/components.html +++ b/components.html @@ -289,7 +289,7 @@ base_url: "../" {% endhighlight %} - +

Add .pull-right to a .dropdown-menu to right align the dropdown menu.

{% highlight html %}