From 03a406d920c0255533aa0f5bb7c3fe4569b8f687 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Sep 2012 15:49:22 -0700 Subject: [PATCH] fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top --- docs/assets/css/bootstrap.css | 1 - less/navbar.less | 1 - less/tests/navbar-fixed-top.html | 92 ++++++++++++++++++++++++++++++ less/tests/navbar-static-top.html | 95 +++++++++++++++++++++++++++++++ less/tests/navbar.html | 57 +++++++------------ 5 files changed, 209 insertions(+), 37 deletions(-) create mode 100644 less/tests/navbar-fixed-top.html create mode 100644 less/tests/navbar-static-top.html diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 654da5b890..d6a249ee6c 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 25651b14a7..33c90694ef 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 0000000000..d454b65f8f --- /dev/null +++ b/less/tests/navbar-fixed-top.html @@ -0,0 +1,92 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + Project name +
+ + +
+
+
+
+ +
+ + +
+

Navbar example

+

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.

+

+ View navbar docs » +

+
+ +
+ + + + + + + + + + + + + + + + + + + diff --git a/less/tests/navbar-static-top.html b/less/tests/navbar-static-top.html new file mode 100644 index 0000000000..ea131d4537 --- /dev/null +++ b/less/tests/navbar-static-top.html @@ -0,0 +1,95 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + Project name +
+ + +
+
+
+
+ + +
+ + +
+

Navbar example

+

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.

+

+ View navbar docs » +

+
+ +
+ + + + + + + + + + + + + + + + + + + diff --git a/less/tests/navbar.html b/less/tests/navbar.html index 17754bf6e8..342b92167e 100644 --- a/less/tests/navbar.html +++ b/less/tests/navbar.html @@ -11,9 +11,12 @@ @@ -32,27 +35,6 @@ - -
-
-
- - - - - - Project name -
- -
-
-
-
-
@@ -71,6 +53,11 @@
  • About
  • Contact
    • +
    @@ -90,19 +77,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +