diff --git a/README.md b/README.md index 03f8f3362bf5..6e3f0f2ba0ab 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bootstrap](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) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies) 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). @@ -65,13 +65,13 @@ When completed, you'll be able to run the various Grunt commands provided from t ### Available Grunt commands #### Build - `grunt` -Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).** +Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess] and [UglifyJS].** #### Only compile CSS and JavaScript - `grunt dist` -`grunt dist` creates the `/dist` directory with compiled files. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).** +`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess] and [UglifyJS].** #### Tests - `grunt test` -Runs jshint and qunit tests headlessly in [phantomjs](https://github.com/ariya/phantomjs/) (used for CI). **Requires [phantomjs](https://github.com/ariya/phantomjs/).** +Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). #### Watch - `grunt watch` This is a convenience method for watching just Less files and automatically building them whenever you save. @@ -139,3 +139,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver. ## Copyright and license Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE). + + [recess]: http://twitter.github.io/recess/ "recess" + [uglifyjs]: http://lisperator.net/uglifyjs/ "UglifyJS" + diff --git a/css.html b/css.html index 3ea6a84c7319..a07567620c1b 100644 --- a/css.html +++ b/css.html @@ -2198,6 +2198,10 @@

.pull-left

float: left !important; } {% endhighlight %} +
+

Not for use in navbars

+

To left-align components in navbars, use .navbar-left instead. See the navbar docs for details.

+

.pull-right

Float an element right with a class. Can also be used as a mixin.

@@ -2209,6 +2213,10 @@

.pull-right

float: right !important; } {% endhighlight %} +
+

Not for use in navbars

+

To right-align components in navbars, use .navbar-right instead. See the navbar docs for details.

+

.clearfix

Clear the float on any element. Utilizes the micro clearfix as popularized by Nicolas Gallagher. Can also be used as a mixin.

diff --git a/getting-started.html b/getting-started.html index 908ccbcc3342..4080408568e4 100644 --- a/getting-started.html +++ b/getting-started.html @@ -17,7 +17,7 @@

Download Bootstrap

Compiled CSS, JS, and fonts

The fastest way to get Bootstrap is to download the compiled and minified versions of our CSS and JavaScript, along with the included fonts. No documentation or original source files are included.

-

Download Bootstrap

+

Download precompiled Bootstrap

Additional downloads

diff --git a/javascript.html b/javascript.html index 62dbc07e6de7..e397efc40d9d 100644 --- a/javascript.html +++ b/javascript.html @@ -1069,7 +1069,7 @@

Options

selector string false - if a selector is provided, tooltip objects will be delegated to the specified targets if a selector is provided, tooltip objects will be delegated to the specified targets. in practice, this is used to enable dynamic HTML content to have popovers added. See this and an informative example. + if a selector is provided, tooltip objects will be delegated to the specified targets if a selector is provided, tooltip objects will be delegated to the specified targets. in practice, this is used to enable dynamic HTML content to have popovers added. See this and an informative example. trigger diff --git a/package.json b/package.json index 71f7aa5b40a2..0bb25e8a0b81 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ , "grunt-contrib-uglify": "~0.2.2" , "grunt-contrib-qunit": "~0.2.2" , "grunt-contrib-watch": "~0.5.1" - , "grunt-html-validation": "git://github.com/praveenvijayan/grunt-html-validation.git" + , "grunt-html-validation": "~0.1.4" , "grunt-jekyll": "~0.3.8" , "grunt-recess": "~0.3.3" , "browserstack-runner": "~0.0.11"