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

bootstrap-1.2.0.css

@@ -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).
@@ -387,7 +391,6 @@ body {
   font-weight: normal;
   line-height: 18px;
   color: #808080;
-  text-rendering: optimizeLegibility;
 }
 .container {
   width: 940px;
@@ -1103,21 +1106,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   z-index: 10000;
   overflow: visible;
 }
-.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 a {
   color: #bfbfbf;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -1194,17 +1182,39 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   -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 div > ul a, .nav a {
   display: block;
@@ -1534,6 +1544,9 @@ footer {
   -khtml-opacity: 0.65;
   -moz-opacity: 0.65;
   opacity: 0.65;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
 }
 .btn:disabled {
   cursor: default;
@@ -1542,6 +1555,9 @@ footer {
   -khtml-opacity: 0.65;
   -moz-opacity: 0.65;
   opacity: 0.65;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
 }
 .btn:active {
   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);

docs/index.html

@@ -34,7 +34,7 @@
     <!-- Topbar
     ================================================== -->
     <div class="topbar">
-      <div class="fill">
+      <div class="topbar-inner">
         <div class="container">
           <h3><a href="#">Bootstrap</a></h3>
           <ul class="nav">
@@ -908,7 +908,7 @@
   <h2>Fixed topbar</h2>
   <div class="topbar-wrapper" style="z-index: 5;">
     <div class="topbar">
-      <div class="fill">
+      <div class="topbar-inner">
         <div class="container">
           <h3><a href="#">Project Name</a></h3>
           <ul class="nav">
@@ -941,7 +941,7 @@
             </li>
           </ul>
         </div>
-      </div><!-- /fill -->
+      </div><!-- /topbar-inner -->
     </div><!-- /topbar -->
   </div><!-- /topbar-wrapper -->
 

lib/patterns.less

@@ -16,14 +16,6 @@
   z-index: 10000;
   overflow: visible;
 
-  // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
-  .fill {
-    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);
-  }
-
   // Links get text shadow
   a {
     color: @grayLight;
@@ -41,7 +33,7 @@
 
   // Website name
   h3 {
-    position:relative;
+    position: relative;
     a {
       float: left;
       display: block;
@@ -102,12 +94,22 @@
   }
 }
 
+// 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 div > .ul
 .topbar div > ul,
 .nav {
   display: block;
@@ -115,10 +117,9 @@
   margin: 0 10px 0 0;
   position: relative;
   left: 0;
-  li {
+  > li {
     display: block;
     float: left;
-    font-size: 13px;
   }
   a {
     display: block;
@@ -423,6 +424,7 @@ footer {
     cursor: default;
     background-image: none;
     .opacity(65);
+    .box-shadow(none);
   }
   &:disabled {
     // disabled pseudo can't be included with .disabled
@@ -430,6 +432,7 @@ footer {
     cursor: default;
     background-image: none;
     .opacity(65);
+    .box-shadow(none);
   }
   &:active {
     @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);

lib/scaffolding.less

@@ -69,7 +69,6 @@ body {
   margin: 0;
   #font > .sans-serif(normal,@basefont,@baseline);
   color: @gray;
-  text-rendering: optimizeLegibility;
 }
 
 // Container (centered, fixed-width layouts)