diff options
| author | Mark Otto <[email protected]> | 2013-08-23 14:00:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-23 14:00:28 -0700 |
| commit | 310642d5acd3b6c3f80f758c854b12a2de4cdeb6 (patch) | |
| tree | 82a514fc15a8a930904328f9531286ccebe64e9c /examples | |
| parent | bbc32f7e7993cd36190e458b47fc333174a9992e (diff) | |
| parent | 7b0d035dd4cea21bcbd01c3d16764a90e9ce009b (diff) | |
| download | bootstrap-310642d5acd3b6c3f80f758c854b12a2de4cdeb6.tar.xz bootstrap-310642d5acd3b6c3f80f758c854b12a2de4cdeb6.zip | |
Merge branch 'master' into header-font-size-vars
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/jumbotron/index.html | 6 | ||||
| -rw-r--r-- | examples/justified-nav/justified-nav.css | 1 |
2 files changed, 3 insertions, 4 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 »</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 »</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 »</a></p> diff --git a/examples/justified-nav/justified-nav.css b/examples/justified-nav/justified-nav.css index 7837acf40..c669d44c7 100644 --- a/examples/justified-nav/justified-nav.css +++ b/examples/justified-nav/justified-nav.css @@ -38,7 +38,6 @@ body { background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */ background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Chrome 10+,Safari 5.1+ */ - background-image: -ms-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* IE10+ */ background-image: -o-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Opera 11.10+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */ background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */ |