From 702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 16:35:55 -0800 Subject: [PATCH] fix broken navbar collapse --- docs/assets/bootstrap.zip | Bin 51322 -> 51339 bytes docs/assets/css/bootstrap-responsive.css | 8 +++++--- docs/base-css.html | 2 +- docs/components.html | 2 +- docs/download.html | 2 +- docs/examples.html | 2 +- docs/index.html | 2 +- docs/javascript.html | 2 +- docs/less.html | 10 +++++----- docs/scaffolding.html | 2 +- docs/templates/layout.mustache | 2 +- docs/upgrading.html | 2 +- less/responsive.less | 23 +++++++++++++++++------ 13 files changed, 36 insertions(+), 23 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1b658bf833ae4f2417d0d94485667b5f173312bc..bd974a462514d6effcf531941a008e6d2bd5a3f0 100644 GIT binary patch delta 3993 zcmZvfc{G%L8^;IP*E05zjD4R8lYNhj>@f_Do$N%)ItbaBCcCkYeUFkYd$txzmMkfh zC0k*#zdTQ!x6b?C=lt$-uJ5(n_wV}Wdp`TgBykuL8Ur1Yb5ww{$2S5)!%a4|$frNG zh{g0VQvH!I;QJ$iNu(e?El$7uORF1RkT?~vPa&{h3T7BsPX^@@JMSBzsIo^rNCPAT z0Q8sv0Df$~JqLCUat>>PqW?W|#GVoD>Nzh6JW^`!k}t$K`ngg=LNtxnPR!QG53hy8 z;~lUtTK1*&C?T ze3vWtSm8Yr-)tje(@)Qa3w@xHytbfrGBMfF<2rtm8Go&%9f7X&L<9u&{2Q9peUu?U zCKgn@=0Nx~Qmh!)4%gg2CUE5*q)O$Ugsixlrg2o1N`(7Ln@`>M;ek>b)qddWsxsxY zQ3E_*FMfhSPN6H}ScDJ5tqyaJ@vpcg?g@;D482y~%Dr;)h&E|z{}U;RX#3jAQx9Q6 zP6-s>Cc7Z#5s^(g-V;N3dW_y`QW#r|vxG-MUvZWRrv1CaMhwdOs_<#amEpZ~g>fhlktSDe>~r?dgw(l!|g-Vbk-ohU2ZqAYyC@3e!O zj+?R4$IB1DK#(ks20~cZdf%f4q=O*IMh3In0Y4co4vvl*v_LmHlF@fNV-OKHEoP0S zB?KbzUqn}MNJrNCa}a)Zn)oS${!{T`F?yJHWS1p#MBwU*b0ZuD8dKWNqn?^q<)?-qXNf) zofi*+t*CF|>|(ETJq}{9U{oK9QE`*2TZ=b-$7cQ-a;{kNDGr@MDp;2-^B7Q+DjCk4 z_tKA_`O-k)azb4s#RniCV5XcF$P4Y_?(d>;v`G(|$zTlb7K^);vC$Og`0Sz>d(|Ep zKptCo>BVgVLyR&GloMcfyAVW@dt0mlSEFq# zPlDreT1y@5EI;Nc3Iuu!aIEoAtqauDuy6Wvwx^-*ATGWd%vgT;r3W`*igvvm^*qo} z@ZF>c(w5}T@dkV(pv@ViU%n?eoNMH*m2=9{z$$qa$*D~t1 z-cHZn(R5PI9XC)|Up>l?71o$fVnh@i*xli*xR7Q&`{ji9I(%A;-jUl{lft*uxxCzS z<4S-F+Fu~LQWJ40x`S04^robM+m}!Is7d$c;mTNJ=6mz>DhNstlNcrSv zz9`)*w~Gx4uBXSL82VN$MZHp^*xRGT_MOaK-5BTWmcmh~6>&iwOIuRnp?KJI(*jk) zllxVOnZ2el%*V0jC)BH;=&aAG#d5$5WrWD6KNyv9Bcz?*Dn}}8q#=2 zLn#bFWz0TBW(7a3;3@r+_7d!TDb&R2{kagTnF95%0JOVhi!rx96j%V;90y45if^ z^XD-t+Lyh!UKHr_au|VUoVrH^SOs9oN%|*%Gm`?IS`@{pNhzx6GP0F?IW?3JEY4p1 zPZQDcoQ5$xKS0z{5=)g8C12Q?W2dA7(hjSSsM9F|6%8(o>zIj9T^OIm_oF3*s!+Uq zHTTD&?%I6MB6#()opi*7o6O~M0H|ii_>LZvq?AtJkoOkE-rO4~Laut>z4Fl`MCoz3 z@#Z`xr%eFW-%U3M9Q)eH$=F^@cqtD-)}qNk47ZXRL|bqfp_RbB?wgIK-{IYRN2==p z_-Z}sxcK;CY>Z4c_Ck0Tj}2Qu~dmOZR2Lp$?y zwh&^6vJK_E1}DOlE-y0nTEYazRu@ygVNz5kgY8q)bhl?2hb}(bzU;k=JWfFn27x1j z;wo`Tp_dYa8<@3T-E`kbY?8&9p=)AO2g~Aq z>b+EO2pBb(I&1}sS!Bwk$x&=E?=IeOxG!vj(sOmsa&QqTTS%+CJ@$cDuMb%MwI)waYp}nOY%BT_D0Vh$r3{Qw5zzI&7uJjMe( z5aJAYG1(<(3a^d|FcS`brqMI}9sg-i2KHW~6aG^!Vq(LBA0wjvt^?ggDh}#`bq|x$ zSi2F`F|w90Lv9mwGax%AD0!bkW2mEfrqV}AacZPtBX*DhqvPO+Zp1Zo^D4u*xX2mwQ|L zp>6p5rE7U$T2mqQdbHqAZZ+rRWWg@vl5oDEu9}QX7MWMvaOq_mxfQB`;+~00&cbpV zCtg&M)S!`+KWsfd9wC$vz?77DRl}lb9bs#lZfK6LvJ{Y7wUCo#7RUm>YEDbcxf%oW znNfCBP|=>8V)Qe(^Ez#B2r7Z01w$u-X>z%B~SqlpG1R(ukNm|r_eRc^X8 zsUU6+#Gzlw&+*n)KPE7ZHQnR;QXQx`P+0OEO)m$zx#kU=0&o&Vp*d(Zf zOw#YN+=)oo(#!1}pVjuU=@HW=T$t9~hzdF9Yaai=nzVxWP;0D|q2jAYCzn5TeQ z!e^>+NRvu3(=@X2wq=x6di|(H#t!!QUY$fB`Wv0vp6`sv(ebdWo`5w(VJReM#CtVQ zd_N=KJ@dGIrB|s!u=)|M;F&_4_^ht_Y?%ywJ^ z4dVQs^g#uY4>MzxI(`kJF-@K@e&&vE%A%o@PG)F8VQvR=#}Wsa+PZ15}7zL(+wYd0jiP)FV=NgV8SL5ja6 zj^Mz5r1S*d-;R2UfWKNlCP04IF(uAlI&0mpmijG8)ieUnq_u7d;(y4Ih2l3*VikKN z|J69pDlk1Ne?;GVG=4?2e_*cWJ`l-50sy<20Q!3@eLslgr1~tuO6%_IA@1Vy-%duXV?Q0) JX7}0U{sRSlWmfX7S^FQa_5BvO{r4Sz{6H^&z6O&K?&YxzV6e@1A zryYFyPdkv_9ds1GB@Fm}OQa-%fM>;-5U$nZ(}G~a zoUL7T$=JaJBlMKj-~aoPALlz=S~TWfO;xrB`un$LF=ls!N%4ELl^V&mtu67WWqk2M zS4rH&WSl>>z-FL`YkjaI$2Dfyw_v6Ehnz163d3yopAQz+`5n^GHN-4 z?{_uTA)BDa4K>-xBMQ-;3=UW|h20Z}7j5XeH6;ZznPoyb0$Fylz3V%fe7rla&+!>O zb1yguuc_Vr;WElC_O$?MF(KKrdKE+m-13)MPZ*mcu!-2*+hkf?e7MF`dMS|GGSYw5{jY}h z(jIZ^5nR@L9>F>sF5XK=)^Qtlk1u7c_xMnIL=Z~ZS|*@~oII%TXt|>IgwdpdX3AmR zKiF7qYY2Vk8hq|l@mAG}E4ssZ-X`&eQaRS$xFNPnQ)TJepm}0k}pb`1b zJAwEHx)FQiN5P9Svqxi-l|*dfKf1>+wLcZ$y^XhzcXDuAqtovYmyp)_(w|phc$1CJ zp}<{2Bd>yn1Sv)KCH4z%dqo9<8l(D%(7{RK!BBlCJv>Y4{t;IVV@x_-1lG@fnx(i% zvJzzn(t)|lOHvxx%X!}?(h`A@h$v^R>j*0&?u@cIP|~2UY60rU*#z&}N2?}3X6b7c zKdP5xI*x%z4_D6l%Jgq3Sl+N)r3M7>-BF4EjOW&>64o*X@tUK{w#B;;^e|ZsK_UtE zx_nh@__7MfE)F3a_fBhr;(0a?39DvYbHYNMMXSjYVCrpOg(o#NFT1jX`QD86aO+)# z@I>oj-|6;0z?oOa^pqrKbyz_ruX0-Ibw?kAQ8QX^r)9?Do7GwZo*UNs*BAhuDmga4 z?|Cui2hE3xy6spdPs~?QzD@PtRnID^0Edd{!FR1{EQ&~O#SnOPVpY_m-fZmO_9ouu=sO}~jAh13Xh)Yj81EvDhcoCdMr zD|O3Y1AW+p-7G7Ql_6>MEiFiQ1&T=Mpyv}9s*g=X>3=Y)&VP-8tiNy$J$U*>PbuOu z+~m%@w&iDf`FF-3oApm0)wAK;t)W-bqfn{v!IQ5! zYwvfQ0|s9B0X^{PJ(!AGQ48*gp50|uTY)Dsw$Ra2tiiYjiLsap?&1Q?lt@l%O z2MSkJ2GhpbKhw4qkxP%hT9!C_#YUO&!`<9kJfpHnx)m;{;sVT#0b>JK)_pXRPt*_? z;i$p3VO2@;fwg6VuPY$t5I*+!t@gWhw7;gGeg>vybb>GTJaCowutrP`q=`mAKii}f zTKHT=3dYD{n4<*~#{}z)_zh3R_%uJU7cq$-dZ>wXKD`j9m|eU*3Ai}s&R%Sno=5M5 zC+3TM*?fT)e1|1HD)g&zT%ovBxNJc+V>j?Al3bZeBogUNwAiQTem8}Ffwa?_n+FeS zBURr~ek#~fIkbKE=@phgFF6czBdD)F-l(!$0msv^b#)fQ0q3LYd^~{8MwOy6u~X{Y z+}T*My9@yE{2VJ(9aR5!tn_-$NYl@rTzg7Fgcvir8yn;mPeK|;hRetCJQIx*6^vct zenUeV>!5G+X0;J`Ub_3szVHAAeIQ#dVE@Dyg0e{Jdj+2aw41kc z@R4}*@2K21htF?HERIu`TA2PR(+0@j7y4qftgVaJjQf0muys4wHVuOwMfqs1qRM5^ z3-%@>@5=%-Ldo6=1`^pU2P)xq5A)@M$cMKcuT)ukgV8>z_zTQ5QB7NAfgYHwGs_Er>@Pya? zrHbFz-o@rJ4oc6W`??kp=aD^LsslVM!VW4jc?3a%orw&++wx(;>XT0AlXO;ZXvn3$5PM=UYq+d5;L!z8 zivJhx}+;_;_N>_!CSzD)9UiW<8VKn6PJkt0aWqWeupW(8VQJU7xps5zHfOtg| z%WA!H2R4yRP8-?0@P{bFd~_YHl{mU9+DM zscL#@Z0}v^GO`wo&$LLziBIl29H>gbUos9n!-q)qm38XS+tzYEWC-nZURpoOVmO}e z;B{0`&NA>F@RnzDd>Vi5=R*4Z<;BAp6;>-sKxbisjj3sWbtsL5 zA>+5oo-zY`h;IF@Zy#mOthGdgFM%C3Zram^w zb&F}ot@|stVIFy}H`c1jODfNknhJx9Ns0w zui4F1py!es2TYj30@apR66BvX5k`1^FWCha89QG$L*|)UO50#muF?1ej#eC+f$e#K z)oY>0M4@{d2NoDDsqc{e?-@>2!C&`Z3!kvLoV31++0EOtCdSr3v{f6tU%4Z?!SdeA zoi=KJTWK%hnPIIQL;EP^>gsreu{hf4e^fGO(%xWp7wnZDo4q+ zwZE({!YG|Ob#HQ|GGltH;6<~@-g?JQ6GY~G|5O_=lQ)J`{LTeRXgn1b$XuXupD6wU zR}G*;^;QL-BTA_n@TDyW3*t=!eE>^l_xgDn&~;rul&_0zCi3&46XkE|)`gM}b?d54 z`p{Jn<391zo=1fjbCKCx7jv_-m4`_EnP3(<)B!wkG#9VO*ulYfGGhCk1bCL4j~&p_ zkc{l4yJ_ZNz7>JER%)Y`84PxE*9{dDO>&h7Pl*MgXlXUX6G3KeL0^G4dDQWJQ~sLB zBrc`aZmEF}AtZYF-BbS0q&ZS?Ji;=k(n6PLKoTPe$L{F2nmYw6D=LYo-yZ=z%Z{Q^y-9!Bzq z#&KSek5T?DB5qgv8BzZSJ|cbFf0c3m_XU9Y9AN=x1POQ-5rf=r7y2Kb>@3Z00D%32 z2Y$YOK6YMWKRycSIftH|>hG;2cd!FN?ntiAD@Y4>D$;*)e>+AOa`!^PXBIT)B>Thh z-1S{VACj|E^uHWEJK34z6MlDe^*#Fw|15fb_Lfd|;?V>Ek|>e=-)`p#t}b@sjk5Cu ZGqs0{r>Lv%zdPxW54$ds&9|MK{|ny(c@zKu 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 // ------------------