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/theme | |
| 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/theme')
| -rw-r--r-- | examples/theme/index.html | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/examples/theme/index.html b/examples/theme/index.html index 54b8d0c84..a44a8220a 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -16,6 +16,12 @@ <!-- Custom styles for this template --> <link href="theme.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> @@ -134,7 +140,7 @@ <h1>Navbars</h1> </div> - <div class="navbar"> + <div class="navbar navbar-default"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> @@ -375,7 +381,6 @@ ================================================== --> <!-- Placed at the end of the document so the pages load faster --> <script src="../../assets/js/jquery.js"></script> - <script src="../../assets/js/respond.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script> <script src="../../assets/js/holder.js"></script> </body> |