diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /examples/theme | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'examples/theme')
| -rw-r--r-- | examples/theme/index.html | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/examples/theme/index.html b/examples/theme/index.html index a0f3128bf..bfa8efdcb 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -2,10 +2,11 @@ <html lang="en"> <head> <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content=""> <meta name="author" content=""> - <link rel="shortcut icon" href="../../assets/ico/favicon.png"> + <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png"> <title>Theme Template for Bootstrap</title> @@ -17,10 +18,13 @@ <!-- Custom styles for this template --> <link href="theme.css" rel="stylesheet"> + <!-- Just for debugging purposes. Don't actually copy this line! --> + <!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]--> + <!-- 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> + <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> <![endif]--> </head> @@ -155,6 +159,18 @@ <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="dropdown-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> </ul> </div><!--/.nav-collapse --> </div> @@ -175,6 +191,18 @@ <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="dropdown-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> </ul> </div><!--/.nav-collapse --> </div> @@ -346,8 +374,8 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <script src="../../assets/js/jquery.js"></script> + <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script> - <script src="../../assets/js/holder.js"></script> + <script src="../../docs-assets/js/holder.js"></script> </body> </html> |