From: Jacob Thornton Date: Sun, 25 Mar 2012 20:33:36 +0000 (-0700) Subject: fix responsive navbar X-Git-Tag: v2.0.3~5^2~93 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a62810918f8a27b5755258521422eb912a1edfd8;p=thirdparty%2Fbootstrap.git fix responsive navbar --- diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index fbf2c75066..9de6e49c6f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 1ad16d6fd9..c374fb8e52 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -667,7 +667,8 @@ .btn-navbar { display: block; } - .nav-collapse { + .nav-collapse, + .nav-collapse.collapse { overflow: hidden; height: 0; } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c1d995e307..50fb64dfc5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2804,7 +2804,7 @@ input[type="submit"].btn.btn-mini { margin-bottom: 18px; } .navbar-inner { - height: 40px; + min-height: 40px; padding-left: 20px; padding-right: 20px; background-color: #2c2c2c; diff --git a/docs/base-css.html b/docs/base-css.html index 6ccc216d1b..1cb10a8061 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -40,7 +40,7 @@ Bootstrap -
+
  • Overview diff --git a/docs/components.html b/docs/components.html index 71134045ad..13d1598c09 100644 --- a/docs/components.html +++ b/docs/components.html @@ -40,7 +40,7 @@ Bootstrap -
    +
    • Overview diff --git a/docs/css-tests.html b/docs/css-tests.html index 0db1057961..c2a932b362 100644 --- a/docs/css-tests.html +++ b/docs/css-tests.html @@ -40,7 +40,7 @@ Bootstrap -
      +
      • Overview diff --git a/docs/download.html b/docs/download.html index e4097ea4e5..c0e3b9cf01 100644 --- a/docs/download.html +++ b/docs/download.html @@ -40,7 +40,7 @@ Bootstrap -
        +
        • Overview diff --git a/docs/examples.html b/docs/examples.html index dffb46fd96..7872a39e85 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -40,7 +40,7 @@ Bootstrap -
          +
          • Overview diff --git a/docs/index.html b/docs/index.html index f7bbfc2b56..1f526fcdb9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -40,7 +40,7 @@ Bootstrap -
            +
            • Overview diff --git a/docs/javascript.html b/docs/javascript.html index 4904eba162..3cba210a1c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -40,7 +40,7 @@ Bootstrap -
              +
              • Overview diff --git a/docs/less.html b/docs/less.html index 8b02f19614..89e06cf913 100644 --- a/docs/less.html +++ b/docs/less.html @@ -40,7 +40,7 @@ Bootstrap -
                +
                • Overview diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 017fd493ea..e2715a2c32 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -40,7 +40,7 @@ Bootstrap -
                  +
                  • Overview diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index d3c06e096f..4fdaadb3b6 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -40,7 +40,7 @@ Bootstrap -
                    +
                    • {{_i}}Overview{{/i}} diff --git a/docs/upgrading.html b/docs/upgrading.html index 05930c25ef..2a27b00e61 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -40,7 +40,7 @@ Bootstrap -
                      +
                      • Overview diff --git a/less/navbar.less b/less/navbar.less index 7d82e84a02..f2f5153a76 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -16,7 +16,7 @@ // Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present .navbar-inner { - height: @navbarHeight; + min-height: @navbarHeight; padding-left: 20px; padding-right: 20px; #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less index 59e456a228..84b0f33f37 100644 --- a/less/responsive-navbar.less +++ b/less/responsive-navbar.less @@ -112,7 +112,7 @@ } // Hide everything in the navbar save .brand and toggle button */ - .nav-collapse { + .nav-collapse, .nav-collapse.collapse { overflow: hidden; height: 0; } @@ -128,4 +128,4 @@ height: auto !important; overflow: visible !important; } -} +} \ No newline at end of file