diff options
| author | Mark Otto <[email protected]> | 2012-09-17 15:49:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-17 15:49:22 -0700 |
| commit | 03a406d920c0255533aa0f5bb7c3fe4569b8f687 (patch) | |
| tree | 917402b6122bbae033c533645032815ac2690897 | |
| parent | f69e244a6036a40fd1721b4e56dc54e5ce1f6af4 (diff) | |
| download | bootstrap-03a406d920c0255533aa0f5bb7c3fe4569b8f687.tar.xz bootstrap-03a406d920c0255533aa0f5bb7c3fe4569b8f687.zip | |
fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 | ||||
| -rw-r--r-- | less/navbar.less | 1 | ||||
| -rw-r--r-- | less/tests/navbar-fixed-top.html | 92 | ||||
| -rw-r--r-- | less/tests/navbar-static-top.html | 95 | ||||
| -rw-r--r-- | less/tests/navbar.html | 57 |
5 files changed, 209 insertions, 37 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 654da5b89..d6a249ee6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4308,7 +4308,6 @@ input[type="submit"].btn.btn-mini { .navbar-static-top { position: static; - width: 100%; margin-bottom: 0; } diff --git a/less/navbar.less b/less/navbar.less index 25651b14a..33c90694e 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -152,7 +152,6 @@ .navbar-static-top { position: static; - width: 100%; margin-bottom: 0; // remove 18px margin for default navbar .navbar-inner { .border-radius(0); diff --git a/less/tests/navbar-fixed-top.html b/less/tests/navbar-fixed-top.html new file mode 100644 index 000000000..d454b65f8 --- /dev/null +++ b/less/tests/navbar-fixed-top.html @@ -0,0 +1,92 @@ +<!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="shortcut icon" href="../../docs/assets/ico/favicon.ico"> + <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"> + </head> + + <body> + + <!-- Fixed navbar --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <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"> + <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> + </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> + + <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="../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 new file mode 100644 index 000000000..ea131d453 --- /dev/null +++ b/less/tests/navbar-static-top.html @@ -0,0 +1,95 @@ +<!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="shortcut icon" href="../../docs/assets/ico/favicon.ico"> + <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"> + </head> + + <body> + + <!-- Static navbar --> + <div class="navbar navbar-static-top"> + <div class="navbar-inner"> + <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"> + <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> + </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> + + + <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="../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 index 17754bf6e..342b92167 100644 --- a/less/tests/navbar.html +++ b/less/tests/navbar.html @@ -11,9 +11,12 @@ <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet"> <style> body { - padding-top: 60px; + padding-top: 0; padding-bottom: 30px; } + .navbar { + margin-top: 20px; + } </style> <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet"> @@ -32,27 +35,6 @@ <body> - <!-- Fixed navbar --> - <div class="navbar navbar-fixed-top"> - <div class="navbar-inner"> - <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"> - <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> - </ul> - </div><!--/.nav-collapse --> - </div> - </div> - </div> - <div class="container"> <!-- Static navbar --> @@ -71,6 +53,11 @@ <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></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> @@ -90,19 +77,19 @@ <!-- Le javascript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <script src="../assets/js/jquery.js"></script> - <script src="../assets/js/bootstrap-transition.js"></script> - <script src="../assets/js/bootstrap-alert.js"></script> - <script src="../assets/js/bootstrap-modal.js"></script> - <script src="../assets/js/bootstrap-dropdown.js"></script> - <script src="../assets/js/bootstrap-scrollspy.js"></script> - <script src="../assets/js/bootstrap-tab.js"></script> - <script src="../assets/js/bootstrap-tooltip.js"></script> - <script src="../assets/js/bootstrap-popover.js"></script> - <script src="../assets/js/bootstrap-button.js"></script> - <script src="../assets/js/bootstrap-collapse.js"></script> - <script src="../assets/js/bootstrap-carousel.js"></script> - <script src="../assets/js/bootstrap-typeahead.js"></script> + <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> |