diff options
| author | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
| commit | 9dcae610e97c5422652d7212fda5985de1653d4c (patch) | |
| tree | 03f5f15fb5d3a1561f69ce97a1a9f651e816330c /examples/justified-nav | |
| parent | 578a14e14aa7c6ad37f307d5d78e9a2afb0e7bfb (diff) | |
| parent | 5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25 (diff) | |
| download | bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.tar.xz bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
Diffstat (limited to 'examples/justified-nav')
| -rw-r--r-- | examples/justified-nav/index.html | 46 | ||||
| -rw-r--r-- | examples/justified-nav/justified-nav.css | 9 |
2 files changed, 23 insertions, 32 deletions
diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index 46ebb6d69..8ab83cc1f 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -14,6 +14,12 @@ <!-- Custom styles for this template --> <link href="justified-nav.css" rel="stylesheet"> + + <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!--[if lt IE 9]> + <script src="../../assets/js/html5shiv.js"></script> + <script src="../../assets/js/respond.min.js"></script> + <![endif]--> </head> <body> @@ -39,29 +45,24 @@ <p><a class="btn btn-lg btn-success" href="#">Get started today</a></p> </div> - - <div class="body-content"> - - <!-- Example row of columns --> - <div class="row"> - <div class="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 btn-primary" href="#">View details »</a></p> - </div> - <div class="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 btn-primary" href="#">View details »</a></p> - </div> - <div class="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 btn-primary" href="#">View details »</a></p> - </div> + <!-- Example row of columns --> + <div class="row"> + <div class="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 btn-primary" href="#">View details »</a></p> </div> - - </div><!-- /.body-content --> + <div class="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 btn-primary" href="#">View details »</a></p> + </div> + <div class="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 btn-primary" href="#">View details »</a></p> + </div> + </div> <!-- Site footer --> <div class="footer"> @@ -74,6 +75,5 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <script src="../../assets/js/respond.min.js"></script> </body> </html> diff --git a/examples/justified-nav/justified-nav.css b/examples/justified-nav/justified-nav.css index 9b8929c35..7837acf40 100644 --- a/examples/justified-nav/justified-nav.css +++ b/examples/justified-nav/justified-nav.css @@ -2,13 +2,6 @@ body { padding-top: 20px; } -/* Everything but the jumbotron gets side spacing for mobile first views */ -.masthead, -.footer { - padding-left: 15px; - padding-right: 15px; -} - .footer { border-top: 1px solid #eee; margin-top: 40px; @@ -83,8 +76,6 @@ body { } } - - /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { /* Remove the padding we set earlier */ |