Commit 57564cf6 authored by Mark Otto's avatar Mark Otto
Browse files

Merge pull request #7719 from burnsra/3.0.0-wip-grid-examples

Update examples after grid changes
parents cd06c5ba 62afdd01
Showing with 25 additions and 25 deletions
+25 -25
......@@ -67,14 +67,14 @@ body {
}
/* Center align the text within the three columns below the carousel */
.marketing .col-span-4 {
.marketing .col-lg-4 {
text-align: center;
margin-bottom: 20px;
}
.marketing h2 {
font-weight: normal;
}
.marketing .col-span-4 p {
.marketing .col-lg-4 p {
margin-left: 10px;
margin-right: 10px;
}
......@@ -323,24 +323,24 @@ body {
<!-- Three columns of text below the carousel -->
<div class="row">
<div class="col-span-4">
<div class="col col-lg-4">
<img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2>
<p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.col-span-4 -->
<div class="col-span-4">
</div><!-- /.col-lg-4 -->
<div class="col col-lg-4">
<img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2>
<p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.col-span-4 -->
<div class="col-span-4">
</div><!-- /.col-lg-4 -->
<div class="col col-lg-4">
<img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.col-span-4 -->
</div><!-- /.col-lg-4 -->
</div><!-- /.row -->
......
......@@ -16,7 +16,7 @@ title: Grid template
margin-left: -15px;
margin-right: -15px;
}
[class*="col-span-"] {
[class*="col-lg-"] {
padding-top: 15px;
padding-bottom: 15px;
background-color: #f5f5f5;
......@@ -32,22 +32,22 @@ title: Grid template
<h4>Three equal columns</h4>
<div class="row">
<div class="col-span-4">.col-span-4</div>
<div class="col-span-4">.col-span-4</div>
<div class="col-span-4">.col-span-4</div>
<div class="col col-lg-4">.col .col-lg-4</div>
<div class="col col-lg-4">.col .col-lg-4</div>
<div class="col col-lg-4">.col .col-lg-4</div>
</div>
<h4>Three unequal columns</h4>
<div class="row">
<div class="col-span-3">.col-span-3</div>
<div class="col-span-6">.col-span-6</div>
<div class="col-span-3">.col-span-3</div>
<div class="col col-lg-3">.col .col-lg-3</div>
<div class="col col-lg-6">.col .col-lg-6</div>
<div class="col col-lg-3">.col .col-lg-3</div>
</div>
<h4>Two columns</h4>
<div class="row">
<div class="col-span-8">.col-span-8</div>
<div class="col-span-4">.col-span-4</div>
<div class="col col-lg-8">.col .col-lg-8</div>
<div class="col col-lg-4">.col .col-lg-4</div>
</div>
<h4>Full width, single column</h4>
......
......@@ -104,7 +104,7 @@ title: Narrow page template
</div>
<div class="row marketing">
<div class="col-span-6">
<div class="col col-lg-6">
<h4>Subheading</h4>
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
......@@ -115,7 +115,7 @@ title: Narrow page template
<p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
</div>
<div class="col-span-6">
<div class="col col-lg-6">
<h4>Subheading</h4>
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
......
......@@ -85,17 +85,17 @@ title: Jumbotron template
<!-- Example row of columns -->
<div class="row">
<div class="col-span-4">
<div class="col col-lg-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="col-span-4">
<div class="col col-lg-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="col-span-4">
<div class="col col-lg-4">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
......
......@@ -119,17 +119,17 @@ title: Justified nav template
<!-- Example row of columns -->
<div class="row">
<div class="col-span-4">
<div class="col col-lg-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="col-span-4">
<div class="col col-lg-4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="col-span-4">
<div class="col col-lg-4">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
......
Supports Markdown
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