diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 232cb9bf0eea2ef72def47e67051c5fad6193ca2..8fa27c91f3fad889ef823067a52e696010c4d6c1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -322,13 +322,11 @@ a:hover {
margin-left: 8.333333333333332%;
}
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
+[class*="span"].hide {
display: none;
}
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
+[class*="span"].pull-right {
float: right;
}
@@ -1252,8 +1250,7 @@ textarea[class*="span"],
clear: both;
}
-.controls-row [class*="span"],
-.row-fluid .controls-row [class*="span"] {
+.controls-row [class*="span"] {
float: left;
}
@@ -1935,8 +1932,7 @@ table {
background-color: #f5f5f5;
}
-table [class*=span],
-.row-fluid table [class*=span] {
+table [class*=span] {
display: table-cell;
float: none;
margin-left: 0;
diff --git a/less/forms.less b/less/forms.less
index 0d1598995f01afb9bf8875a03a768a1403c2b26e..f02e36f30e3659983de8a7bc2134ee5950ec12ae 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -331,9 +331,7 @@ textarea[class*="span"],
}
// Float to collapse white-space for proper grid alignment
-.controls-row [class*="span"],
-// Redeclare the fluid grid collapse since we undo the float for inputs
-.row-fluid .controls-row [class*="span"] {
+.controls-row [class*="span"] {
float: left;
}
diff --git a/less/grid.less b/less/grid.less
index cab62ce5b115b53105059864495353246616bd5f..836e29a95ba239a91b27763f935dac2244e6e0bb 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -12,12 +12,10 @@
#grid > .core(@gridColumnWidth, @gridGutterWidth, @gridRowWidth);
// Reset utility classes due to specificity
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
+[class*="span"].hide {
display: none;
}
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
+[class*="span"].pull-right {
float: right;
}
diff --git a/less/tables.less b/less/tables.less
index 2b1dd7d223c0af272409c5a74e17a90c7c24df75..bc3c52451d58ec71561cae711265619b5b8ebc75 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -171,8 +171,7 @@ table {
// -----------------
// Reset default grid behavior
-table [class*=span],
-.row-fluid table [class*=span] {
+table [class*=span] {
display: table-cell;
float: none; // undo default grid column styles
margin-left: 0; // undo default grid column styles
diff --git a/less/tests/css-tests.css b/less/tests/css-tests.css
index 9edaf69bfb77008823e6cf10ac05c524fbdd57d2..8ab487db2f569fd2d3b3de9e5e140e27c535663b 100644
--- a/less/tests/css-tests.css
+++ b/less/tests/css-tests.css
@@ -44,28 +44,6 @@ body {
}
-/* Fluid row inputs */
-#rowInputs .row > [class*=span],
-#fluidRowInputs .row-fluid > [class*=span] {
- background-color: rgba(255,0,0,.1);
-}
-
-
-/* Fluid grid */
-.fluid-grid {
- margin-bottom: 45px;
-}
-.fluid-grid .row {
- height: 40px;
- padding-top: 10px;
- margin-top: 10px;
- color: #ddd;
- text-align: center;
-}
-.fluid-grid .span1 {
- background-color: #999;
-}
-
/* Gradients */
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index ca9dd3ea31813825948e0b254db58d09d9f82811..2d9725b3bfd331bea88788fc4b4d87226dc87c0f 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -467,38 +467,6 @@
</div>
</div><!--/row-->
-<h4>Fluid grid sizing</h4>
-<div class="row-fluid">
- <div class="span12">
- <table class="table table-bordered">
- <thead>
- <tr>
- <th class="span3">1</th>
- <th class="span4">2</th>
- <th>3</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan="2">1 and 2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td rowspan="2">2</td>
- <td>3</td>
- </tr>
- <tr>
- <td rowspan="2">1</td>
- <td>3</td>
- </tr>
- <tr>
- <td colspan="2">2 and 3</td>
- </tr>
- </tbody>
- </table>
- </div>
-</div><!--/row-->
@@ -602,28 +570,6 @@
</div><!--/span-->
</div><!--/row-->
-<h4>Fluid prepended and appended inputs</h4>
-<div class="row-fluid">
- <div class="span6">
- <form>
- <div class="controls">
- <div class="input-prepend">
- <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
- </div>
- </div>
- <div class="controls">
- <div class="input-append">
- <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
- </div>
- </div>
- <div class="controls">
- <div class="input-prepend input-append">
- <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
- </div>
- </div>
- </form>
- </div>
-</div>
<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>
@@ -692,99 +638,6 @@
</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">
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span1" placeholder="span1">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span2" placeholder="span2">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span3" placeholder="span3">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span4" placeholder="span4">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span5" placeholder="span5">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span6" placeholder="span6">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span7" placeholder="span7">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span8" placeholder="span8">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span9" placeholder="span9">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span10" placeholder="span10">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span11" placeholder="span11">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span12" placeholder="span12">
- </div><!--/span-->
- </div><!--/row-->
-</div>
-
-<br>
-
-<h4>Inline form in fluid row</h4>
-
-<div class="row-fluid">
- <div class="span12">
- <form class="form-inline">
- <input type="text" class="span3" placeholder="Email">
- <input type="password" class="span3" placeholder="Password">
- <label class="checkbox">
- <input type="checkbox"> Remember me
- </label>
- <button type="submit" class="btn">Sign in</button>
- </form>
- </div>
-</div>
-
-
-<br>
-
-
-<h4>Fluid textarea at .span12</h4>
-<div class="row-fluid">
- <div class="span12">
- <textarea class="span12"></textarea>
- </div>
-</div>
-
<br>
@@ -923,29 +776,6 @@
</li>
</ul>
-<h4>Fluid thumbnails</h4>
-<div class="row-fluid">
- <div class="span8">
- <ul class="thumbnails">
- <li class="span4">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span4">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span4">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- </ul>
- </div>
-</div>
-
<!-- Tabs