aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-23 22:56:23 -0700
committerMark Otto <[email protected]>2013-08-23 22:56:23 -0700
commitb86cd3bc3d866838127e7af15f665c70e7f50847 (patch)
tree0044cbd39cc9927c8a48ca178b019c049520e2ca /examples
parent22ce6499102c2ab87bbd8a303b5d26531c6e7df2 (diff)
parentd5a27855459325290ace93538f5ceafb22dee27a (diff)
downloadbootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.tar.xz
bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.zip
Merge branch 'master' into deprecate-screen-device-vars
Conflicts: less/variables.less
Diffstat (limited to 'examples')
-rw-r--r--examples/jumbotron/index.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
index 86255fca3..31d11eebb 100644
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -77,17 +77,17 @@
<div class="container">
<!-- Example row of columns -->
<div class="row">
- <div class="col-lg-4">
+ <div class="col-md-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 btn-default" href="#">View details &raquo;</a></p>
</div>
- <div class="col-lg-4">
+ <div class="col-md-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 btn-default" href="#">View details &raquo;</a></p>
</div>
- <div class="col-lg-4">
+ <div class="col-md-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 btn-default" href="#">View details &raquo;</a></p>