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

1 files changed, 14 insertions, 11 deletions

diff --git a/lib/patterns.less b/lib/patterns.less
index 77b16de7b..29870dc30 100644
--- a/lib/patterns.less
+++ b/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);