mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-12 08:34:08 +02:00
Merge pull request #1196 from OpenGrid/2.0-wip
Fixed span sum to 10 to display properly. Grid has 12 columns.
This commit is contained in:
@@ -49,12 +49,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Styles you shouldn't keep as they are for displaying this base example only */
|
/* Styles you shouldn't keep as they are for displaying this base example only */
|
||||||
.content .span10,
|
.content .span7,
|
||||||
.content .span4 {
|
.content .span3 {
|
||||||
min-height: 500px;
|
min-height: 500px;
|
||||||
}
|
}
|
||||||
/* Give a quick and non-cross-browser friendly divider */
|
/* Give a quick and non-cross-browser friendly divider */
|
||||||
.content .span4 {
|
.content .span3 {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
padding-left: 19px;
|
padding-left: 19px;
|
||||||
border-left: 1px solid #eee;
|
border-left: 1px solid #eee;
|
||||||
@@ -100,10 +100,10 @@
|
|||||||
<h1>Page name <small>Supporting text or tagline</small></h1>
|
<h1>Page name <small>Supporting text or tagline</small></h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span10">
|
<div class="span7">
|
||||||
<h2>Main content</h2>
|
<h2>Main content</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="span4">
|
<div class="span3">
|
||||||
<h3>Secondary content</h3>
|
<h3>Secondary content</h3>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Reference in New Issue
Block a user