Skip to content

B
bootstrap
Commit 08eea302 authored by Mark Otto's avatar Mark Otto
Browse files
Options

remove remaining fluid grid css

parent 151ed38c
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 209 deletions
docs/assets/css/bootstrap.css
View file @ 08eea302
...@@ -322,13 +322,11 @@ a:hover { ...@@ -322,13 +322,11 @@ a:hover {
margin-left: 8.333333333333332%; margin-left: 8.333333333333332%;
} }
[class*="span"].hide, [class*="span"].hide {
.row-fluid [class*="span"].hide {
display: none; display: none;
} }
[class*="span"].pull-right, [class*="span"].pull-right {
.row-fluid [class*="span"].pull-right {
float: right; float: right;
} }
...@@ -1252,8 +1250,7 @@ textarea[class*="span"], ...@@ -1252,8 +1250,7 @@ textarea[class*="span"],
clear: both; clear: both;
} }
.controls-row [class*="span"], .controls-row [class*="span"] {
.row-fluid .controls-row [class*="span"] {
float: left; float: left;
} }
...@@ -1935,8 +1932,7 @@ table { ...@@ -1935,8 +1932,7 @@ table {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
table [class*=span], table [class*=span] {
.row-fluid table [class*=span] {
display: table-cell; display: table-cell;
float: none; float: none;
margin-left: 0; margin-left: 0;
......
less/forms.less
View file @ 08eea302
...@@ -331,9 +331,7 @@ textarea[class*="span"], ...@@ -331,9 +331,7 @@ textarea[class*="span"],
} }
// Float to collapse white-space for proper grid alignment // Float to collapse white-space for proper grid alignment
.controls-row [class*="span"], .controls-row [class*="span"] {
// Redeclare the fluid grid collapse since we undo the float for inputs
.row-fluid .controls-row [class*="span"] {
float: left; float: left;
} }
......
less/grid.less
View file @ 08eea302
...@@ -12,12 +12,10 @@ ...@@ -12,12 +12,10 @@
#grid > .core(@gridColumnWidth, @gridGutterWidth, @gridRowWidth); #grid > .core(@gridColumnWidth, @gridGutterWidth, @gridRowWidth);
// Reset utility classes due to specificity // Reset utility classes due to specificity
[class*="span"].hide, [class*="span"].hide {
.row-fluid [class*="span"].hide {
display: none; display: none;
} }
[class*="span"].pull-right, [class*="span"].pull-right {
.row-fluid [class*="span"].pull-right {
float: right; float: right;
} }
less/tables.less
View file @ 08eea302
...@@ -171,8 +171,7 @@ table { ...@@ -171,8 +171,7 @@ table {
// ----------------- // -----------------
// Reset default grid behavior // Reset default grid behavior
table [class*=span], table [class*=span] {
.row-fluid table [class*=span] {
display: table-cell; display: table-cell;
float: none; // undo default grid column styles float: none; // undo default grid column styles
margin-left: 0; // undo default grid column styles margin-left: 0; // undo default grid column styles
......
less/tests/css-tests.css
View file @ 08eea302
...@@ -44,28 +44,6 @@ body { ...@@ -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 */ /* Gradients */
......
less/tests/css-tests.html
View file @ 08eea302
...@@ -467,38 +467,6 @@ ...@@ -467,38 +467,6 @@
</div> </div>
</div><!--/row--> </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 @@ ...@@ -602,28 +570,6 @@
</div><!--/span--> </div><!--/span-->
</div><!--/row--> </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> <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> <p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
...@@ -692,99 +638,6 @@ ...@@ -692,99 +638,6 @@
</div> </div>
<br> <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> <br>
...@@ -923,29 +776,6 @@ ...@@ -923,29 +776,6 @@
</li> </li>
</ul> </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 <!-- Tabs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment