From 02abdd60378aa5aecbb9d8bafe23f0cd2b86141a Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 00:02:44 -0700
Subject: remove inset shadow from disabled buttons

---
 lib/patterns.less | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index 91294103c..77396922e 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -422,6 +422,7 @@ footer {
     cursor: default;
     background-image: none;
     .opacity(65);
+    .box-shadow(none);
   }
   &:disabled {
     // disabled pseudo can't be included with .disabled
-- 
cgit v1.2.3


From 479e0ccd6bd4c32c2445e0cb6291c17c5aa4f7a2 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 00:28:54 -0700
Subject: add backwards compatability for dropdowns in topbar

---
 lib/patterns.less | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index 77396922e..03f31e0fe 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,22 +94,31 @@
   }
 }
 
+// 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
+.topbar > ul, // For backwards compatability
 .nav {
   display: block;
   float: left;
   margin: 0 10px 0 0;
   position: relative;
   left: 0;
-  li {
+  > li {
     display: block;
     float: left;
-    font-size: 13px;
   }
   a {
     display: block;
@@ -430,6 +431,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);
-- 
cgit v1.2.3


From 5ef4519ca8ddf035a19d8f6dfff8745fdb380e32 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 00:29:54 -0700
Subject: move comment so less compiles

---
 lib/patterns.less | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index 260eb87f4..fbb00d8a0 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -109,12 +109,9 @@
 
 // Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
-<<<<<<< HEAD
-.topbar > ul, // For backwards compatability
+// For backwards compatability, leave in .topbar > .ul
+.topbar > ul,
 .nav {
-=======
-.topbar > ul, .nav {
->>>>>>> 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261
   display: block;
   float: left;
   margin: 0 10px 0 0;
-- 
cgit v1.2.3