diff options
| author | Mark Otto <[email protected]> | 2013-02-26 00:37:59 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-26 00:37:59 -0800 |
| commit | 91660a0489e005d68a430bce298726d2313ac579 (patch) | |
| tree | 8768c844cb73d294d10974a40c672c6f68a1d71b | |
| parent | e1bb94c38370fd2542415557c660d0804d4f42b1 (diff) | |
| download | bootstrap-91660a0489e005d68a430bce298726d2313ac579.tar.xz bootstrap-91660a0489e005d68a430bce298726d2313ac579.zip | |
Move navbar examples to /examples directory
| -rw-r--r-- | docs/_layouts/default.html | 2 | ||||
| -rw-r--r-- | docs/getting-started.html | 23 | ||||
| -rw-r--r-- | less/tests/navbar-fixed-top.html | 102 | ||||
| -rw-r--r-- | less/tests/navbar-static-top.html | 105 | ||||
| -rw-r--r-- | less/tests/navbar.html | 105 |
5 files changed, 24 insertions, 313 deletions
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 0f1a891a9..acab46de9 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -20,4 +20,4 @@ {% include footer.html %} </body> -</html>
\ No newline at end of file +</html> diff --git a/docs/getting-started.html b/docs/getting-started.html index 08a51ee10..7f8dbff01 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -230,6 +230,29 @@ description: Overview of the project, its contents, and how to get started with <h4>Carousel jumbotron</h4> <p>An interactive riff on the basic marketing site featuring a prominent carousel.</p> </div> + + + <div class="span4"> + <a class="thumbnail" href="/examples/navbar/"> + <img src="/assets/img/examples/bootstrap-example-.png" alt=""> + </a> + <h4>Navbar</h4> + <p></p> + </div> + <div class="span4"> + <a class="thumbnail" href="/examples/navbar-static-top/"> + <img src="/assets/img/examples/bootstrap-example-.png" alt=""> + </a> + <h4>Static top navbar</h4> + <p></p> + </div> + <div class="span4"> + <a class="thumbnail" href="/examples/navbar-fixed-top/"> + <img src="/assets/img/examples/bootstrap-example-.png" alt=""> + </a> + <h4>Fixed top navbar</h4> + <p></p> + </div> </div> </section> diff --git a/less/tests/navbar-fixed-top.html b/less/tests/navbar-fixed-top.html deleted file mode 100644 index a4765474b..000000000 --- a/less/tests/navbar-fixed-top.html +++ /dev/null @@ -1,102 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <title>Bootstrap, from Twitter</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content=""> - <meta name="author" content=""> - - <!-- Le styles --> - <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet"> - <style> - body { - padding-top: 60px; - padding-bottom: 30px; - } - </style> - <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet"> - - <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> - - <!-- Le fav and touch icons --> - <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png"> - <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png"> - </head> - - <body> - - <!-- Fixed navbar --> - <div class="navbar navbar-fixed-top"> - <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </a> - <a class="brand" href="#">Project name</a> - <div class="nav-collapse collapse"> - <ul class="nav"> - <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="nav-header">Nav header</li> - <li><a href="#">Separated link</a></li> - <li><a href="#">One more separated link</a></li> - </ul> - </li> - </ul> - <ul class="nav pull-right"> - <li><a href="./navbar.html">Default</a></li> - <li><a href="./navbar-static-top.html">Static top</a></li> - <li class="active"><a href="./navbar-fixed-top.html">Fixed top</a></li> - </ul> - </div><!--/.nav-collapse --> - </div> - </div> - - <div class="container"> - - <!-- Main hero unit for a primary marketing message or call to action --> - <div class="hero-unit"> - <h1>Navbar example</h1> - <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p> - <p> - <a class="btn btn-large btn-primary" href="../../docs/components.html#navbar">View navbar docs »</a> - </p> - </div> - - </div> <!-- /container --> - - <!-- Le javascript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="../../docs/assets/js/jquery.js"></script> - <script src="../../docs/assets/js/bootstrap-transition.js"></script> - <script src="../../docs/assets/js/bootstrap-alert.js"></script> - <script src="../../docs/assets/js/bootstrap-modal.js"></script> - <script src="../../docs/assets/js/bootstrap-dropdown.js"></script> - <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script> - <script src="../../docs/assets/js/bootstrap-tab.js"></script> - <script src="../../docs/assets/js/bootstrap-tooltip.js"></script> - <script src="../../docs/assets/js/bootstrap-popover.js"></script> - <script src="../../docs/assets/js/bootstrap-button.js"></script> - <script src="../../docs/assets/js/bootstrap-collapse.js"></script> - <script src="../../docs/assets/js/bootstrap-carousel.js"></script> - <script src="../../docs/assets/js/bootstrap-typeahead.js"></script> - - </body> -</html> diff --git a/less/tests/navbar-static-top.html b/less/tests/navbar-static-top.html deleted file mode 100644 index 5ba478241..000000000 --- a/less/tests/navbar-static-top.html +++ /dev/null @@ -1,105 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <title>Bootstrap, from Twitter</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content=""> - <meta name="author" content=""> - - <!-- Le styles --> - <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet"> - <style> - body { - padding-bottom: 30px; - } - .hero-unit { - margin-top: 20px; - } - </style> - <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet"> - - <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> - - <!-- Le fav and touch icons --> - <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png"> - <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png"> - </head> - - <body> - - <!-- Static navbar --> - <div class="navbar navbar-static-top"> - <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </a> - <a class="brand" href="#">Project name</a> - <div class="nav-collapse collapse"> - <ul class="nav"> - <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="nav-header">Nav header</li> - <li><a href="#">Separated link</a></li> - <li><a href="#">One more separated link</a></li> - </ul> - </li> - </ul> - <ul class="nav pull-right"> - <li><a href="./navbar.html">Default</a></li> - <li class="active"><a href="./navbar-static-top.html">Static top</a></li> - <li><a href="./navbar-fixed-top.html">Fixed top</a></li> - </ul> - </div><!--/.nav-collapse --> - </div> - </div> - - - <div class="container"> - - <!-- Main hero unit for a primary marketing message or call to action --> - <div class="hero-unit"> - <h1>Navbar example</h1> - <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p> - <p> - <a class="btn btn-large btn-primary" href="../../docs/components.html#navbar">View navbar docs »</a> - </p> - </div> - - </div> <!-- /container --> - - <!-- Le javascript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="../../docs/assets/js/jquery.js"></script> - <script src="../../docs/assets/js/bootstrap-transition.js"></script> - <script src="../../docs/assets/js/bootstrap-alert.js"></script> - <script src="../../docs/assets/js/bootstrap-modal.js"></script> - <script src="../../docs/assets/js/bootstrap-dropdown.js"></script> - <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script> - <script src="../../docs/assets/js/bootstrap-tab.js"></script> - <script src="../../docs/assets/js/bootstrap-tooltip.js"></script> - <script src="../../docs/assets/js/bootstrap-popover.js"></script> - <script src="../../docs/assets/js/bootstrap-button.js"></script> - <script src="../../docs/assets/js/bootstrap-collapse.js"></script> - <script src="../../docs/assets/js/bootstrap-carousel.js"></script> - <script src="../../docs/assets/js/bootstrap-typeahead.js"></script> - - </body> -</html> diff --git a/less/tests/navbar.html b/less/tests/navbar.html deleted file mode 100644 index 3399ccf13..000000000 --- a/less/tests/navbar.html +++ /dev/null @@ -1,105 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <title>Bootstrap, from Twitter</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content=""> - <meta name="author" content=""> - - <!-- Le styles --> - <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet"> - <style> - body { - padding-top: 0; - padding-bottom: 30px; - } - .navbar { - margin-top: 20px; - } - </style> - <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet"> - - <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> - - <!-- Le fav and touch icons --> - <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png"> - <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png"> - </head> - - <body> - - <div class="container"> - - <!-- Static navbar --> - <div class="navbar"> - <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </a> - <a class="brand" href="#">Project name</a> - <div class="nav-collapse collapse"> - <ul class="nav"> - <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="nav-header">Nav header</li> - <li><a href="#">Separated link</a></li> - <li><a href="#">One more separated link</a></li> - </ul> - </li> - </ul> - <ul class="nav pull-right"> - <li class="active"><a href="./navbar.html">Default</a></li> - <li><a href="./navbar-static-top.html">Static top</a></li> - <li><a href="./navbar-fixed-top.html">Fixed top</a></li> - </ul> - </div><!--/.nav-collapse --> - </div> - </div> - - <!-- Main hero unit for a primary marketing message or call to action --> - <div class="hero-unit"> - <h1>Navbar example</h1> - <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p> - <p> - <a class="btn btn-large btn-primary" href="../../docs/components.html#navbar">View navbar docs »</a> - </p> - </div> - - </div> <!-- /container --> - - <!-- Le javascript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="../../docs/assets/js/jquery.js"></script> - <script src="../../docs/assets/js/bootstrap-transition.js"></script> - <script src="../../docs/assets/js/bootstrap-alert.js"></script> - <script src="../../docs/assets/js/bootstrap-modal.js"></script> - <script src="../../docs/assets/js/bootstrap-dropdown.js"></script> - <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script> - <script src="../../docs/assets/js/bootstrap-tab.js"></script> - <script src="../../docs/assets/js/bootstrap-tooltip.js"></script> - <script src="../../docs/assets/js/bootstrap-popover.js"></script> - <script src="../../docs/assets/js/bootstrap-button.js"></script> - <script src="../../docs/assets/js/bootstrap-collapse.js"></script> - <script src="../../docs/assets/js/bootstrap-carousel.js"></script> - <script src="../../docs/assets/js/bootstrap-typeahead.js"></script> - - </body> -</html> |