diff --git a/Makefile b/Makefile
index 827b6920ec83f9da4c49d9f35b5d8bd3619ab537..a795a8d008d22b32a41125c44a7734a4ae49b432 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ test:
jshint js/*.js --config js/.jshintrc
jshint js/tests/unit/*.js --config js/.jshintrc
node js/tests/server.js &
+ sleep 5
phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
kill -9 `cat js/tests/pid.txt`
rm js/tests/pid.txt
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 7f669d573fb1b27a0354f62007669e30d408510b..4791a686f9b75f32d5477b3ef293c1f98dd1bd4f 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -169,7 +169,7 @@
}
[class*="span"],
.row-fluid [class*="span"] {
- display: block;
+ display: inline-block;
float: none;
width: auto;
margin-left: 0;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 09e2833dcdefc4d7eededbcea0dabba19af1b356..f13cad826dd5fa415f0c0099ed8daad04ca3f89d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4651,15 +4651,15 @@ a.badge:hover {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
-webkit-transition: width 0.6s ease;
-moz-transition: width 0.6s ease;
-ms-transition: width 0.6s ease;
-o-transition: width 0.6s ease;
transition: width 0.6s ease;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
}
.progress-striped .bar {
diff --git a/docs/base-css.html b/docs/base-css.html
index 5c55e043234a140b50c827a447290d57a5c4db3a..d1197820e0779c787539951fd3b60fe1b09f4c1d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1272,7 +1272,7 @@ For example, <code>section</code> should be wrapped as inline.
</label>
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- Option two can is something else and selecting it will deselect option one
+ Option two can be something else and selecting it will deselect option one
</label>
</div>
</div>
diff --git a/docs/components.html b/docs/components.html
index 1678e58aa5b4cad2651df8bb2ba42904492f5c29..4ce4abdb1952a6e8f9a790439165eb0b0af55ad0 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -813,7 +813,7 @@
<h3>Straightforward markup</h3>
<p>Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.</p>
<pre class="prettyprint linenums">
-<div class="tabbable"> <-- Only required for left/right tabs -->
+<div class="tabbable"> <!-- Only required for left/right tabs -->
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">Section 1</a></li>
<li><a href="#tab2" data-toggle="tab">Section 2</a></li>
diff --git a/docs/less.html b/docs/less.html
index 3fecd1ade2997f42d8bde2b14c2d7ae8e121b492..781bd2fb720e50267a045c71ae0829e6c104950c 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -975,8 +975,8 @@
<div class="row">
<div class="span4">
<h3>Node with makefile</h3>
- <p>Install the LESS command line compiler and uglify-js globally with npm by running the following command:</p>
- <pre>$ npm install -g less uglify-js</pre>
+ <p>Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:</p>
+ <pre>$ npm install -g less jshint recess uglify-js</pre>
<p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
<p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
</div><!-- /span4 -->
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index caffa6af66ae6cac4e4539b47cef49edd01d15c1..e88656dbb0f37c6c2801b348c2e8b527255b72e5 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -529,16 +529,16 @@
</div><!-- /.span -->
<div class="span8">
<pre class="prettyprint linenums">
- // Landscape phones and down
+ /* Landscape phones and down */
@media (max-width: 480px) { ... }
- // Landscape phone to portrait tablet
+ /* Landscape phone to portrait tablet */
@media (max-width: 767px) { ... }
- // Portrait tablet to landscape and desktop
+ /* Portrait tablet to landscape and desktop */
@media (min-width: 768px) and (max-width: 979px) { ... }
- // Large desktop
+ /* Large desktop */
@media (min-width: 1200px) { ... }
</pre>
</div><!-- /.span -->
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 3524ac98521eedab2e9e255291cdb319b04873e4..b91b7d349d5d0d3a47691062e4ce5b3ef15afb6d 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1195,7 +1195,7 @@
</label>
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- {{_i}}Option two can is something else and selecting it will deselect option one{{/i}}
+ {{_i}}Option two can be something else and selecting it will deselect option one{{/i}}
</label>
</div>
</div>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 8e81a95df04e04c8dc31fc56a86b2d68f54e7f2b..c6a78d2cc8c5749cce65db8f0456bbc6ce82a9dd 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -736,7 +736,7 @@
<h3>{{_i}}Straightforward markup{{/i}}</h3>
<p>{{_i}}Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.{{/i}}</p>
<pre class="prettyprint linenums">
-<div class="tabbable"> <-- Only required for left/right tabs -->
+<div class="tabbable"> <!-- Only required for left/right tabs -->
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">{{_i}}Section 1{{/i}}</a></li>
<li><a href="#tab2" data-toggle="tab">{{_i}}Section 2{{/i}}</a></li>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 7698dd290004609792c543a72bbfeaae0c56b1c1..0532b2f9cce30219852083ecd51721a7309bd5be 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -898,8 +898,8 @@
<div class="row">
<div class="span4">
<h3>{{_i}}Node with makefile{{/i}}</h3>
- <p>{{_i}}Install the LESS command line compiler and uglify-js globally with npm by running the following command:{{/i}}</p>
- <pre>$ npm install -g less uglify-js</pre>
+ <p>{{_i}}Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:{{/i}}</p>
+ <pre>$ npm install -g less jshint recess uglify-js</pre>
<p>{{_i}}Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.{{/i}}</p>
<p>{{_i}}Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}</p>
</div><!-- /span4 -->
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 13c777a260b78b06381a8768cb403689d8cd91a7..2db9e9d3dee97722249693667bc7690f053cff60 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -452,16 +452,16 @@
</div><!-- /.span -->
<div class="span8">
<pre class="prettyprint linenums">
- // {{_i}}Landscape phones and down{{/i}}
+ /* {{_i}}Landscape phones and down{{/i}} */
@media (max-width: 480px) { ... }
- // {{_i}}Landscape phone to portrait tablet{{/i}}
+ /* {{_i}}Landscape phone to portrait tablet{{/i}} */
@media (max-width: 767px) { ... }
- // {{_i}}Portrait tablet to landscape and desktop{{/i}}
+ /* {{_i}}Portrait tablet to landscape and desktop{{/i}} */
@media (min-width: 768px) and (max-width: 979px) { ... }
- // {{_i}}Large desktop{{/i}}
+ /* {{_i}}Large desktop{{/i}} */
@media (min-width: 1200px) { ... }
</pre>
</div><!-- /.span -->
diff --git a/js/README.md b/js/README.md
index c7b71e70f2e94db7e4f5184aef67ba65601a4746..b7927ba6b2414e314a1889b7a2976d0b0d952a10 100644
--- a/js/README.md
+++ b/js/README.md
@@ -5,9 +5,9 @@ These are the high-level design rules which guide the development of Bootstrap's
### DATA-ATTRIBUTE API
-We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript. This is bootstraps first class api.
+We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API.
-We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
+We acknowledge that this isn't always the most performant and it may sometimes be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
$('body').off('.data-api')
@@ -19,7 +19,7 @@ To target a specific plugin, just include the plugins name as a namespace along
### PROGRAMATIC API
-We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
+We also believe you should be able to use all plugins provided by Bootstrap purely through the JavaScript API.
All public APIs should be single, chainable methods, and return the collection acted upon.
@@ -45,7 +45,7 @@ An options definition should take the following form:
*noun*: *adjective* - describes or modifies a quality of an instance
-examples:
+Examples:
backdrop: true
keyboard: false
@@ -93,7 +93,7 @@ Data attributes should take the following form:
- data-target || href^=# - defined on "control" element (if element controls an element other than self)
- data-{{noun}} - defines class instance options
-examples:
+Examples:
// control other targets
data-toggle="modal" data-target="#foo"
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 614c6905c2d62ae642e7135c99840baa6c16601a..e35e45d892a9b2cf116c0ad59a196d8cd396668f 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -120,7 +120,7 @@
[class*="span"],
.row-fluid [class*="span"] {
float: none;
- display: block;
+ display: inline-block;
width: auto;
margin-left: 0;
}
diff --git a/less/tests/css-tests.css b/less/tests/css-tests.css
index ac764270aa222dd440a6639ca28ec13a46a88a6d..e0870be449acceb6b3099fa26315f0d58676f4ef 100644
--- a/less/tests/css-tests.css
+++ b/less/tests/css-tests.css
@@ -30,6 +30,7 @@ h4 {
/* Fluid row inputs */
+#rowInputs .row > [class*=span],
#fluidRowInputs .row-fluid > [class*=span] {
background-color: rgba(255,0,0,.1);
}
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index b290186211bed60a20412962df2946c5ad213d41..0e964e27f4478e9feb3bc14a1e2bec4edaacf1b6 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -500,6 +500,73 @@
</div><!--/span-->
</div><!--/row-->
+<h4>Fixed row with inputs</h4>
+<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
+
+<div class="rowInputs">
+ <div class="row">
+ <div class="span12">
+ <input class="span1" placeholder="span1">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span2" placeholder="span2">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span3" placeholder="span3">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span4" placeholder="span4">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span5" placeholder="span5">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span6" placeholder="span6">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span7" placeholder="span7">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span8" placeholder="span8">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span9" placeholder="span9">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span10" placeholder="span10">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span11" placeholder="span11">
+ </div><!--/span-->
+ </div><!--/row-->
+ <div class="row">
+ <div class="span12">
+ <input class="span12" placeholder="span12">
+ </div><!--/span-->
+ </div><!--/row-->
+</div>
+<br>
+
<h4>Fluid row with inputs</h4>
<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
<div id="fluidRowInputs">