From: Mark Otto Date: Mon, 30 Jan 2012 00:35:55 +0000 (-0800) Subject: fix broken navbar collapse X-Git-Tag: v2.0.0~6^2~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2;p=thirdparty%2Fbootstrap.git fix broken navbar collapse --- diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1b658bf833..bd974a4625 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 68ccf676fd..76e27d6720 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -305,12 +305,14 @@ .btn-navbar { display: block; } - .nav-collapse.collapse { + .nav-collapse { overflow: hidden; height: 0; } - .nav-collapse.collapse.in { - height: auto; +} +@media (min-width: 940px) { + .nav-collapse.collapse { + height: auto !important; } } @media (min-width: 1200px) { diff --git a/docs/base-css.html b/docs/base-css.html index 291feb6e16..0406ff229e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -39,7 +39,7 @@ Bootstrap -
+
  • Overview diff --git a/docs/components.html b/docs/components.html index 81c328352a..9fc762fc62 100644 --- a/docs/components.html +++ b/docs/components.html @@ -39,7 +39,7 @@ Bootstrap -
    +
    • Overview diff --git a/docs/download.html b/docs/download.html index 97f1c24c49..832b07ce65 100644 --- a/docs/download.html +++ b/docs/download.html @@ -39,7 +39,7 @@ Bootstrap -
      +
      • Overview diff --git a/docs/examples.html b/docs/examples.html index b2fd296d14..7d79fc0a0a 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -39,7 +39,7 @@ Bootstrap -
        +
        • Overview diff --git a/docs/index.html b/docs/index.html index 7d728dc7dd..e20d08bcdd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -39,7 +39,7 @@ Bootstrap -
          +
          • Overview diff --git a/docs/javascript.html b/docs/javascript.html index 9838aa0d19..eb4a175c33 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -39,7 +39,7 @@ Bootstrap -
            +
            • Overview diff --git a/docs/less.html b/docs/less.html index 4499c78dfc..5935c91259 100644 --- a/docs/less.html +++ b/docs/less.html @@ -39,7 +39,7 @@ Bootstrap -
              +
              • Overview @@ -345,13 +345,13 @@ @warningText - #c09853 - + #f3edd2 + @warningBackground - #f3edd2 - + #c09853 + @errorText diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 00aadd472e..b9eb399f9b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -39,7 +39,7 @@ Bootstrap -
                +
                • Overview diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index b49ec28f6e..7c0ab655be 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -39,7 +39,7 @@ Bootstrap -
                  +
                  • {{_i}}Overview{{/i}} diff --git a/docs/upgrading.html b/docs/upgrading.html index b8e82fe31b..d7ad30f561 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -39,7 +39,7 @@ Bootstrap -
                    +
                    • Overview diff --git a/less/responsive.less b/less/responsive.less index 7ae28b8258..a1d4cf2c88 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -22,6 +22,7 @@ } + // UP TO LANDSCAPE PHONE // --------------------- @@ -103,11 +104,11 @@ } + // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET // -------------------------------------------------- @media (max-width: 768px) { - // GRID & CONTAINERS // ----------------- // Remove width from containers @@ -133,6 +134,7 @@ } + // PORTRAIT TABLET TO DEFAULT DESKTOP // ---------------------------------- @@ -225,6 +227,7 @@ } + // TABLETS AND BELOW // ----------------- @media (max-width: 940px) { @@ -335,17 +338,25 @@ } // Hide everything in the navbar save .brand and toggle button */ - .nav-collapse.collapse { + .nav-collapse { overflow: hidden; height: 0; } - .nav-collapse.collapse.in { - height: auto; - } +} + + + +// DEFAULT DESKTOP +// --------------- +@media (min-width: 940px) { + .nav-collapse.collapse { + height: auto !important; + } } + // LARGE DESKTOP & UP // ------------------