From b32cfa2cf2c0b8bf54aac6bada6109c2cfe3d012 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 21 Aug 2013 18:11:33 -0400 Subject: [PATCH 1/6] Update Grunt instruction links and wording --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 03f8f3362b..af3d5a3709 100644 --- a/README.md +++ b/README.md @@ -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" + From 31641d3d6d4c7584b9b4d0ecd1de178c18a75b6f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 21 Aug 2013 15:11:56 -0700 Subject: [PATCH 2/6] add David (david-dm.org) badge to monitor currentness of dependencies --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 03f8f3362b..1915fb9ff4 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). From ca63686fdaf3869074a3329b49a042d3e1d369fa Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 22 Aug 2013 12:20:56 -0400 Subject: [PATCH 3/6] Use NPM version of grunt-html-validation The package is now published, so the direct git url is no longer required --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71f7aa5b40..0bb25e8a0b 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" From 354e2ee4f90d8a561ac7c04f35249ca30fdd1e50 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 22 Aug 2013 12:26:04 -0700 Subject: [PATCH 4/6] add cross-reference to .navbar-left/right in .pull-left/right docs --- css.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/css.html b/css.html index d705ca549b..8aae2488db 100644 --- a/css.html +++ b/css.html @@ -2166,6 +2166,10 @@ For example, <section> should be wrapped as inline. 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.

@@ -2177,6 +2181,10 @@ For example, <section> should be wrapped as inline. 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.

From f7d6b488e6f5b2b82914c9afe1f04b4c4e5b8f11 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 22 Aug 2013 12:30:32 -0700 Subject: [PATCH 5/6] fix #10029 --- getting-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started.html b/getting-started.html index 908ccbcc33..4080408568 100644 --- a/getting-started.html +++ b/getting-started.html @@ -17,7 +17,7 @@ base_url: "../"

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

From 99b35150ee12d7a693de5ce45eded2f62e9e8354 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 22 Aug 2013 16:51:57 -0700 Subject: [PATCH 6/6] update outdated JSFiddle example --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript.html b/javascript.html index 62dbc07e6d..e397efc40d 100644 --- a/javascript.html +++ b/javascript.html @@ -1069,7 +1069,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { 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