Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less

diff --cc bootstrap-1.2.0.css
index 81b9ba1b1bf8a330f50a332eb52c6284a7204213,f78b533e61a8fd37eac47af003b9ec14e3edd9e2..c28624b05d0f3c786978e317484b1be0b33beee6
--- 1/bootstrap-1.2.0.css
--- 2/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@@ -6,7 -6,7 +6,11 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
++<<<<<<< HEAD
 + * Date: Fri Sep  2 00:31:17 PDT 2011
++=======
+  * Date: Fri Sep  2 00:29:45 PDT 2011
++>>>>>>> 5ef4519ca8ddf035a19d8f6dfff8745fdb380e32
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@@ -1194,19 -1178,33 +1182,41 @@@ table .headerSortUp.purple, table .head
    -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
    box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
  }
++<<<<<<< HEAD
 +.topbar div > ul, .nav {
++=======
+ .topbar-inner, .topbar .fill {
+   background-color: #222;
+   background-color: #222222;
+   background-repeat: repeat-x;
+   background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+   background-image: -moz-linear-gradient(top, #333333, #222222);
+   background-image: -ms-linear-gradient(top, #333333, #222222);
+   background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+   background-image: -webkit-linear-gradient(top, #333333, #222222);
+   background-image: -o-linear-gradient(top, #333333, #222222);
+   background-image: linear-gradient(top, #333333, #222222);
+   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+ }
+ .topbar > ul, .nav {
++>>>>>>> 5ef4519ca8ddf035a19d8f6dfff8745fdb380e32
    display: block;
    float: left;
    margin: 0 10px 0 0;
    position: relative;
    left: 0;
  }
++<<<<<<< HEAD
 +.topbar div > ul li, .nav li {
++=======
+ .topbar > ul > li, .nav > li {
++>>>>>>> 5ef4519ca8ddf035a19d8f6dfff8745fdb380e32
    display: block;
    float: left;
-   font-size: 13px;
  }
 -.topbar > ul a, .nav a {
 +.topbar div > ul a, .nav a {
    display: block;
    float: none;
    padding: 10px 10px 11px;

diff --cc bootstrap-1.2.0.min.css
index aaf545a408db67c24b2612ebd50795420cf474a3,a17b01bb6c78989b665ce4c0ec09bb528522ded3..fdc4d1c6d24c5c167c86047fad93c322a1c7dff4
--- 1/bootstrap-1.2.0.min.css
--- 2/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@@ -184,14 -183,15 +183,26 @@@ table .headerSortUp.purple,table .heade
  .topbar input::-webkit-input-placeholder{color:#e6e6e6;}
  .topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
  .topbar input:focus,.topbar input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
++<<<<<<< HEAD
 +.topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul li,.nav li{display:block;float:left;font-size:13px;}
 +.topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#fff;text-decoration:none;}
 +.topbar div>ul .active a,.nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
 +.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;}
 +.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);}
 +.topbar div>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar div>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#fff;}.topbar div>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);}
 +.topbar div>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;}
 +.topbar div>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;}
++=======
+ .topbar-inner,.topbar .fill{background-color:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+ .topbar>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar>ul>li,.nav>li{display:block;float:left;}
+ .topbar>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar>ul a:hover,.nav a:hover{color:#fff;text-decoration:none;}
+ .topbar>ul .active a,.nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
+ .topbar>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;}
+ .topbar>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);}
+ .topbar>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#fff;}.topbar>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);}
+ .topbar>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;}
+ .topbar>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;}
++>>>>>>> 5ef4519ca8ddf035a19d8f6dfff8745fdb380e32
  .dropdown{position:relative;}
  .dropdown-toggle:after{width:0;height:0;display:inline-block;content:"&darr;";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
  .dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;}

diff --cc docs/index.html
Simple merge

diff --cc lib/patterns.less
index 77b16de7bf667ba9202e01ca65571d15d1ab0775,fbb00d8a0fa94765e380d7dac214a5341e7037e6..29870dc30610668d6f33eae34233a2762f022362
--- 1/lib/patterns.less
--- 2/lib/patterns.less
+++ b/lib/patterns.less
@@@ -102,13 -94,23 +94,23 @@@
    }
  }
  
 -.topbar-inner, 
+ // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
++.topbar-inner,
+ .topbar .fill { // For backwards compatability
+   background-color: #222;
+   #gradient > .vertical(#333, #222);
+   @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+   .box-shadow(@shadow);
+ }
+ 
  
  // NAVIGATION
  // ----------
  
  // Topbar Nav
  // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
 -// For backwards compatability, leave in .topbar > .ul
 -.topbar > ul,
++// For backwards compatability, leave in .topbar div > .ul
 +.topbar div > ul,
  .nav {
    display: block;
    float: left;