From d640c3b14b78bd17407ba123cbc718a6e34bb5d5 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 6 Sep 2011 23:30:21 -0700
Subject: [PATCH] update diagrams to use smaller border radius, add new
container-app example
---
docs/assets/img/example-diagram-01.png | Bin 1675 -> 1641 bytes
docs/assets/img/example-diagram-02.png | Bin 1831 -> 1742 bytes
docs/assets/img/example-diagram-03.png | Bin 1531 -> 1428 bytes
docs/index.html | 6 +-
examples/container-app.html | 111 +++++++++++++++++++++++++
5 files changed, 114 insertions(+), 3 deletions(-)
create mode 100644 examples/container-app.html
diff --git a/docs/assets/img/example-diagram-01.png b/docs/assets/img/example-diagram-01.png
index 16ac0c44ee5d1b4eeff1ad556742030d77ae05d7..0cece3b3eadb7de46b803b42b42304093ae268c5 100644
GIT binary patch
delta 733
zcmeC?eaW*Sib=u3#nRH%$;H{l(AdS$(AB`n&CSf!!qC{l(be3|#K3rR6_X51krPfu
z+nACR+|1403=Pdq49txT%q$EIEnJ+O+zbpYjV;VfEle#9CR;Gq)tmYHyk=lvn(pc1
z7*cWT%^hpMI{_jM4|k?K5xS_LcyZ|&tqAteX@Z>{?%x_+rsf_n%XneaWyHHkTB=wl
zP{G6SNco%U^nL!jI?ny*sIRG5b~C5UnwjmUF_VB02WJZl2s<$;GCDP#^@zPblL^8H
zi#1MQP&{bQc1FCrRrA1w36D$)&poc`FV0cfu+8k8@0|ErkMP2}8Jsmy{~uU(e^%X^
z``i4UrHSy5{L{9A2NT-=^)ML;2u<F=qQwC+sd0jX$K*y9!}?PknVCEWCpPiFyd{$`
zVRq%7ogJ5tSoRjDsBPG0Us!ki=geE%O!*`<N@LTx6jVU2gt*j+sfA@WhvvD|lky2I
zb|;Td4>A%jj+|}37-DwA1O@H;|JcCx9GE@f(VREG1RfoI^6qc~SY5r|JdcE}%&X_t
ziyn(vQ`RuyKvsIIq4;Xqh_?)@=Yqw+(m>Xkqgm`>)*Eg`CW2TIZxJdRGQ)P)+rC;Q
z@1v@H=EmmriF&~`c2!D_%hWGTSudk%*ID+e&U>csTjQ_(Ulf}w=QLZyKYr6+a(1}|
zf1w=reBX6DuN2kqPd=Zz`q@qUiTiqOru@C0Jx%X=OxDi(8=r3q{rtu`OKnG9@IiH-
z&B@=RFYh%`ZDUE{$TU4z8ZLS!Z7W!8jTg^LyK|pAuGiG<O?z2%cImX=vekOgrvCQs
zRrUh*?z2+Nww}Lo-DARI*JJB}LGR$9paQ}ILOJur8QDY`67-GbLXS>f#{dMLu6{1-
HoD!M<D77gu
delta 742
zcmaFK)6Kgfib=uT&BfBhz|_py&D7b@(AB`n#Kg$L!p+3Q)Wq4s+}Le$6_X51ktt3^
z+nAD=49q7hFeyy7Vy>yL<km}MU|`zm>EaktaqG=($Gpo9A`OZDPQgn(M4O~HJQ0!U
zoqf>sMnMbL#*8N}B^Am#AyXB$Zro`5?YpP))(swir^MHJUcO>-_Bq>&)MOR~6#*d*
zP7rQkabjv=`R{(payHWr<;DpP9t}VYl2=e+c&2Il^OxE=JD+n`C;w-z)0StoI%;`j
z=lgyCg-@HEyRE12pwcU#ys$2B_l$d;9C2&D6vw{vd)j^dt`~cZ*yY2^s(o2v^7e1M
z<d`2m``GT{3*n!*BPAv;V=<gu#-dSwFv|JVF^0WQgf5+wSuj1A^JN0xh0_aLO5U$y
znSQ_5%lY=Z*=FZT=d9g%pj&BI_vZ<6f0MzkId`t-!Ti3v-itP!t=!DlHmOKV<jYg>
zO{ji4rzy|<%jCJd!E>9F=cfl5i5C~TGbuv+mmu}8hv`oJM36rpT+Ci#A%ESjrDE=n
zr|S<cNzr@u>CeuJ&5Ucx61HwWG^6_}--cU_SI==J>xEfwxWyP|t=+RT;_ZPfb}$Ph
zk3;3<HD%B9O0V)Sn<Sd{=H_*S>6-KUK}H;`3EQoif3Ubd_H|h4-r)18oS$n%pZm`F
zUYO@zbw<8$-_f6TpP!!%C|>!r>iE3Vi=IV>?dDhJf4Z&u%ueYny{$3tZxlyfvGMlU
z%_&zNeo#1V`=-}xUq+P`^KeQiEGcU`o~u2>cQ;t<mSx))({qJKj@y*=Tb4VYT{`Wx
zY_(qZtmWJHpXW6>di(z3b3og_oMe;8*vbq_35twB+&Cd2v5wP#q00W&#=_<&><mEQ
M>FVdQ&MBb@03ka`d;kCd
diff --git a/docs/assets/img/example-diagram-02.png b/docs/assets/img/example-diagram-02.png
index 90c30e6a137e87ed2859766e5e193b29f3300bc5..557edd3112250f67e8491d68ab97acb31105c27d 100644
GIT binary patch
delta 855
zcmZ3^caC>MG?ToGrKPKrtAUH5v5TRhtAUf7o0+SHp|ORdtGSzrf$`)jCRvCY7dM=0
zwlO6sxS5-~85)|K7?>Lwm{}MaTDUklxfvK*8e5o|T9{fIOtxUIt5@uiKghtq^vBc1
zF{I+wn>!n`L>wg!e2li;#$(35scf2E>-og${)EX35?Br{7YO<(^~^M9O;P&<w>R%*
z74rFQwCH~D?u~ize)%2`ow9WE|8L4Y_vCGisEK6w|8$}^gA<ct;{*mEcJNS8aquwc
z)m!>Rt3h3egR_MNgzJF{7@e9pb++Gro5L>O_VE1u=QjKjk2|kC|Ejot_nu2fUcakY
z^H2VH@TVA^>@DY?r~Z3f8#lf6Q0=tqv-ik7FD-p^-+LZ+&$pj76-sN<EgHWv+w)Ca
z%dfaL&EmtWM)~#=Vf(V#m1{RM3c&3ITM2TPgGa+;4pzR&-&q7W^cX?TablXhhefOY
zU)lR<0SkX;DApGFuefm5=mzKB)2q+F4vq7_E8p~c-u35u?zwSi&cFWpaZ^?cXQl*O
zd2`m!b+Ql>K&Ai<ZwPk!o92AI^!h~oFt3-l>fT-#=Ikj`P!SMPP?-_4{btUknB(8#
z)jzl}0W~xwEc%;v_;i?liPy_(b@jLJuFp3+;Ia6wO#Z1Cy$YFmTdenJK2Cl3_@2bu
zH`}*feD|TPM_xSj-jt8urC-H9-D-a8VvxsX*%%KK;h;K}<Cc<(`~Grqo|`Uz;t<Cl
zhifa6_q$me+-kgdE+hTQ#`wju5^oP=q;J^_WF>52UOYGOcwKK9kaaF+i?wM`i)=l6
znp~+@{OXLwcW3-IzvbxdzvRzVtwZ4}UVWGT$er9$ZT+?MlN4uEb?+40ldmh|#9RBm
z8?Vo={JWxNfAM?eSATWO<}R|G7$>stg!u8~Yy0l+{4V(QpV)4{i%zf3Kba9MvwOY5
zl6_Z;KS*&(@nn{(9iQ{)#%?aV`(<nAId7S;@0ssb{fa$*KhD_tzWiOS%ijG**9Fgz
zKk>^lsJ42=%X@ycbN9G4O`GQtVC)YJO;}30_(v##VUAYsg>CE7FERjur>mdKI;Vst
E0Ctpn%K!iX
delta 910
zcmX@dyPR)BG?To!rMa`Cfu*yXsk5P>tAUe=iIIhcn~903iL-^dvD@S-CRwN&3!G}U
zF(ok>m`_$<QkZPTTvK1|6|sqdfjQLE#WAGf)|)#A^DcXdG$i`Za`BqL^=gu;_q-<e
z*Rv01Z%91J720qmEH`B4#u-W>POh!Cc8}}kn_OC2{;=n*{QPCAD_`&WF8d)q%#V?S
zvxUWp34|3JCom`;Gzq%@{Tx$;QsV>%j|L!CP!SMPP?_N{>+^&9{r?RtmOjb4u;y#?
zif@%~Ki%q)xEXL-asBH(>rT!8ulhkVj@zfm{{H<1>Xmb+&Mxyh%)R5p>vt2?gVtVW
zT738XYN6n@(&fQ@Q{^g!Iy=Jt?3y2*+Hxzz?#Dm<|M~h#QazdbweGiH*;f7Ny5gq0
zS<BQ9JnM{azu><#)cm}4(#uYc`1TW%<WC&pn0$*xiwER1nDZvjV^OI$*?&)Up=0fq
z34H4~d97TyU*0lZ=y?62)2>e;i?%MmSa9F%kK9Wq9}|&_1^d6fZqR?Hw_d;U?dMxh
zx0deZc($!Zx+wJDr}x(!<6nGuq<6aM!=aWd-|zig7F(yl4GkPnm?)?`m=Uo5=7b=t
z{+dm{_StWb|NYg4X|XIvJuo0SIMt?qs<OSj(f;>x;R+>2r>2e0vy%52UEZj1INywC
zeoN4AX1BgNuK=%?cZ2*({?&bG{;OBM|L|;H{ZCbqKX=^!wChV6v$xdSta^>d3uT1G
zzPd=wc~Uy<`Z6b%!|bo_PCdRq@OYiL=%v5){$CgN)YmMyw{b!Or{dX<+o#oQA24$2
zDlwKWeG~5Sq37pWHVMZq^;vmWHpVZOm3YgrcrH+DZ&|_?=AJS)+25wO8ZYtzS=NjD
z{z|<)kiqV@yVHGlva;)q!h~mm%fIdHGP~8gvmT`NK*skE8|}X**9rdawMslwTf5xO
z|8>Ii-=T5&pRCrF?0H{Vd+K#|{o~(rtK|dN=WqQilDnlk`lrhLY02C6-QW3L@awNI
zYyXQ*x9lb-`xU;)Wme3c{!41lO$KhBm(OO(6n7=xH!0YESLdrKFw&C0e-4h!-l=;$
zr*?nwd*xSO*OtvY^vB`a?fbd!7EgU`{k8JbY~BqAF7m;XEijY?{|F?AGPtvSyv48h
R#hU>LJYD@<);T3K0RSJWtX=>B
diff --git a/docs/assets/img/example-diagram-03.png b/docs/assets/img/example-diagram-03.png
index 00401e0b16fc3d807796e8f60fc7e5755e5f8919..acf819d408cdd36bdfaa1a14657fadc9a6146be0 100644
GIT binary patch
delta 428
zcmey(J%xKi6qACbiKU6FrHiGDp|Ojhp{s$Do12-dg`u&9qpP`_iGlItDkd42A`6^~
zwlO6sxS5-~85)|K7?>Lwm{}MaTDUklxfvK*8e5o|T9{fIOtxUIt3UJZE;|DQ;~`HM
z$B>F!Z>}3=wK#}0Je=E`@_s|CU((~ROqR~CT5W@JbewOg?6R(GYW$MuCb5rSZrY-K
z@}^&F=kp)fFLRekK!}60g$0D2m=qbEnv8<Z?EGLUS9~r%&vdtLrI&x<k8f^F^UD-e
z96S_MK&l}+CZA*BXKI)*xsFA9aypCb<YO%25U%m$3qbBU7Vdh-*NRV5Bkk^FecSLh
zF7HvViSOm3%BlPttFMRM^Z1@95qGSxX72N!cNZ^hE4_YgZui~lxbh8OegYkE$WkuJ
z&v5R4Bdy5CkxBcK@|N1a-zD|m<92J!zfO(Hb0YV4-k<T#^xwo?UE*c8*=9X9=7zeT
iNwIOl0!Mo$9)<(LH?5LZ+wOhE00f?{elF{r5}E)bKcUkA
delta 520
zcmbQj{hND36qAC5xuv<Yqk)UFo2j#*p{s$DiHVVgg`0_qsfn|Nxv|^iDkd42B4?b6
zwlO6!8CXnKU{aWD#avS#l)Ld00|S$$r;B4q#jQ8D46_aeFf=?|X6C2MclXX0E?H}h
zFD#F4ZB75+v~Jzn3me&ATwB<*OI&72*anrC+%7LJtyF9LQ2T*nSId*9=e>_)7)Yd~
zAJ{*~npHtXK!}4Agj-mgm|9q#b{u*!ZBKvMv{dcovu^2q(s<Q+_F$JRi`-iWkA?{j
z9w7A)JuNH{J&KHz@35#%c3@#)Qc#(^oW+<4Au{<ni@@ZqEGqTCoW*LauU=8~y}bU9
zRL+sEEw|s^^U*B5@&5b!-pGm9UVmMzxs-49)mJMuwS&y0dY3&sx4~d-$Q~)(Puc6c
zCPXF1Ox-*AY}(|U?YE~tEU1t^{&B13vaSxb$tMrj*!|~_pS<b2c<aTrF9eO=eg8du
z^UXK=uD`xpYBg8-^4XQG(%)WZ7wxQ(>py;Z!(X2Gr}iaFeK}uB1n*<o)}4ELOK{T?
ziT0$~VH+=ZbMYJK&I`S)^x$#B<h}j>r7}g|yOp+-*jzYLbJ^tIO$H|>#l{H?K<wag
d!NH!1haq!9;;XYP$GI4Qz|+;wWt~$(6984!+j9T_
diff --git a/docs/index.html b/docs/index.html
index 7d58032691..bb8ac6c67f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -153,7 +153,7 @@
<a href="../examples/fluid.html"><img src="assets/img/example-diagram-02.png" class="diagram" alt="Fluid layout with static sidebar"></a>
</div>
<div class="span4">
- <a href="../examples/application.html"><img src="assets/img/example-diagram-03.png" class="diagram" alt="Simple hanging container for apps"></a>
+ <a href="../examples/container-app.html"><img src="assets/img/example-diagram-03.png" class="diagram" alt="Simple hanging container for apps"></a>
</div>
</div>
</div>
@@ -961,7 +961,7 @@
<li class="active dropdown">
<a href="#" class="dropdown-toggle">Dropdown</a>
<ul class="dropdown-menu">
- <li class="active"><a href="#">Secondary link</a></li>
+ <li><a href="#">Secondary link</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Another link</a></li>
@@ -998,7 +998,7 @@
</div>
<div class="span6 columns">
<h4>Dropdowns included</h4>
- <p>As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done.</p>
+ <p>As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <code>li</code> tags also support <code>.active</code> for showing current page selection.</p>
</div>
</div>
<p><strong>Note:</strong> When using the topbar on any page, be sure to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>body</code>.</p>
diff --git a/examples/container-app.html b/examples/container-app.html
new file mode 100644
index 0000000000..98f9cd69fd
--- /dev/null
+++ b/examples/container-app.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <title>Bootstrap, from Twitter</title>
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- Le styles -->
+ <link href="../bootstrap-1.2.0.css" rel="stylesheet">
+ <style type="text/css">
+ /* Override some defaults */
+ html, body {
+ background-color: #eee;
+ }
+ body {
+ padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
+ }
+ .container > footer p {
+ text-align: center; /* center align it with the container */
+ }
+ .container {
+ width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */
+ }
+
+ /* The white background content wrapper */
+ .content {
+ background-color: #fff;
+ padding: 20px;
+ margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
+ -webkit-border-radius: 0 0 6px 6px;
+ -moz-border-radius: 0 0 6px 6px;
+ border-radius: 0 0 6px 6px;
+ -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+ -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+ box-shadow: 0 1px 2px rgba(0,0,0,.15);
+ }
+
+ /* Page header tweaks */
+ .page-header {
+ background-color: #f5f5f5;
+ padding: 20px 20px 10px;
+ margin: -20px -20px 20px;
+ }
+
+ /* Styles you shouldn't keep as they are for displaying this base example only */
+ .content .span10,
+ .content .span4 {
+ min-height: 500px;
+ }
+ /* Give a quick and non-cross-browser friendly divider */
+ .content .span4 {
+ margin-left: 0;
+ padding-left: 19px;
+ border-left: 1px solid #eee;
+ }
+
+ </style>
+
+ <!-- Le fav and touch icons -->
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
+ </head>
+
+ <body>
+
+ <div class="topbar">
+ <div class="fill">
+ <div class="container">
+ <h3><a href="#">Project name</a></h3>
+ <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>
+ <p class="pull-right">Logged in as <a href="#">username</a></p>
+ </div>
+ </div>
+ </div>
+
+ <div class="container">
+
+ <div class="content">
+ <div class="page-header">
+ <h1>Page name <small>Supporting text or tagline</small></h1>
+ </div>
+ <div class="row">
+ <div class="span10">
+ <h2>Main content</h2>
+ </div>
+ <div class="span4">
+ <h3>Secondary content</h3>
+ </div>
+ </div>
+ </div>
+
+ <footer>
+ <p>© Company 2011</p>
+ </footer>
+
+ </div> <!-- /container -->
+
+ </body>
+</html>
--
GitLab