From 4f67e135dc2a8ad7a7b3d8946cc7a857a34881a0 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 26 Aug 2011 20:38:23 -0700
Subject: adding dropdowns to tabs by refactoring the shizzzz out of them

---
 lib/patterns.less | 398 +++++++++++++++++++++++++++---------------------------
 1 file changed, 196 insertions(+), 202 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index d0e4cda12..f5ca099cb 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -17,8 +17,8 @@
   overflow: visible;
 
   // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
-  .fill {
-    background:#222;
+  .wrapper {
+    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);
@@ -100,151 +100,213 @@
       }
     }
   }
+}
 
-  // Navigation
-  ul {
+
+// NAVIGATION
+// ----------
+// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
+.nav {
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+  position: relative;
+  left: 0;
+  &.secondary-nav {
+    float: right;
+    margin-left: 10px;
+    margin-right: 0;
+  }
+  li {
     display: block;
     float: left;
-    margin: 0 10px 0 0;
-    position: relative;
-    &.secondary-nav {
-      float: right;
-      margin-left: 10px;
-      margin-right: 0;
-    }
-    li {
+    font-size: 13px;
+    a {
       display: block;
-      float: left;
-      font-size: 13px;
-      a {
-        display: block;
-        float: none;
-        padding: 10px 10px 11px;
-        line-height: 19px;
+      float: none;
+      padding: 10px 10px 11px;
+      line-height: 19px;
+      text-decoration: none;
+      &:hover {
+        color: #fff;
         text-decoration: none;
-        &:hover {
-          color: #fff;
-          text-decoration: none;
-        }
-      }
-      &.active a {
-        background-color: #222;
-        background-color: rgba(0,0,0,.5);
       }
     }
+    &.active a {
+      background-color: #222;
+      background-color: rgba(0,0,0,.5);
+    }
+  }
 
-    // Dropdowns
-    &.primary-nav li ul {
-      left: 0;
+  // Dropdowns within the .nav
+  &.secondary-nav li .dropdown-menu {
+    right: 0;
+  }
+}
+
+// Dropdown Menus
+// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
+.dropdown {
+  position: relative;
+}
+// The link that is clicked to toggle the dropdown
+.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;
+  .opacity(50);
+}
+// The dropdown menu (ul)
+.dropdown-menu {
+  background-color: #fff;
+  float: left;
+  display: none; // None by default, but block on "open" of the menu
+  position: absolute;
+  top: 40px;
+  min-width: 160px;
+  max-width: 220px;
+  _width: 160px;
+  margin-left: 0; // override default ul styles
+  margin-right: 0;
+  padding: 6px 0;
+  zoom: 1; // do we need this?
+  border-color: #999;
+  border-color: rgba(0,0,0,.2);
+  border-style: solid;
+  border-width: 0 1px 1px;
+  .border-radius(0 0 6px 6px);
+  .box-shadow(0 2px 4px rgba(0,0,0,.2));
+  .background-clip(padding-box);
+
+  // Unfloat any li's to make them stack
+  li {
+    float: none;
+    display: block;
+    background-color: none;
+    // Links within the dropdown menu
+    a {
+      display: block;
+      padding: 4px 15px;
+      clear: both;
+      font-weight: normal;
+      line-height: 18px;
+      color: @gray;
+      text-shadow: 0 1px 0 #fff;
+      // Hover state
+      &:hover {
+        #gradient > .vertical(#eeeeee, #dddddd);
+        color: @grayDark;
+        text-decoration: none;
+        @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
+        .box-shadow(@shadow);
+      }
     }
-    &.secondary-nav li ul {
-      right: 0;
+    // Dividers (basically an hr) within the dropdown
+    &.divider {
+      height: 1px;
+      margin: 5px 0;
+      overflow: hidden;
+      background-color: #eee;
+      border-bottom: 1px solid #fff;
     }
-    li.menu {
-      position: relative;
-      a.menu {
-        &:after {
-          width: 0px;
-          height: 0px;
-          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;
-          .opacity(50);
-        }
-      }
-      &.open {
-        a.menu,
-        a:hover {
-          background-color: #444;
-          background-color: rgba(255,255,255,.1);
-          *background-color: #444; /* IE6-7 */
-          color: #fff;
-        }
-        ul {
-          display: block;
-          li {
-            a {
-              background-color: transparent;
-              font-weight: normal;
-              &:hover {
-                background-color: rgba(255,255,255,.1);
-                *background-color: #444; /* IE6-7 */
-                color: #fff;
-              }
-            }
-            &.active a {
-              background-color: rgba(255,255,255,.1);
-              font-weight: bold;
-            }
-          }
-        }
+  }
+}
+// Open state for the dropdown
+.dropdown.open {
+  .dropdown-toggle {
+    color: #fff;
+    background-color: rgba(0,0,0,.3);
+  }
+  .dropdown-menu {
+    display: block;
+  }
+}
+
+// Tabs and Pills
+.tabs,
+.pills {
+  margin: 0 0 20px;
+  padding: 0;
+  list-style: none;
+  .clearfix();
+  > li {
+    float: left;
+    > a {
+      display: block;
+    }
+  }
+}
+
+// Basic Tabs
+.tabs {
+  width: 100%;
+  border-bottom: 1px solid #ddd;
+  > li {
+    position: relative; // For the dropdowns mostly
+    > a {
+      margin-bottom: -1px;
+      margin-right: 2px;
+      padding: 0 15px;
+      line-height: (@baseline * 2) - 1;
+      .border-radius(4px 4px 0 0);
+      &:hover {
+        background-color: #eee;
+        border-bottom: 1px solid #ddd;
+        text-decoration: none;
       }
     }
-    li ul {
-      background-color: #333;
-      float: left;
-      display: none;
-      position: absolute;
-      top: 40px;
-      min-width: 160px;
-      max-width: 220px;
-      _width: 160px;
-      margin-left: 0;
-      margin-right: 0;
-      padding: 0;
-      text-align: left;
-      border: 0;
-      zoom: 1;
-      .border-radius(0 0 5px 5px);
-      .box-shadow(0 1px 2px rgba(0,0,0,0.6));
-      li {
-        float: none;
-        clear: both;
-        display: block;
-        background: none;
-        font-size: 12px;
-        a {
-          display: block;
-          padding: 6px 15px;
-          clear: both;
-          font-weight: normal;
-          line-height: 19px;
-          color: #bbb;
-          &:hover {
-            background-color: #333;
-            background-color: rgba(255,255,255,.25);
-            color: #fff;
-          }
-        }
-
-        // Dividers (basically an hr)
-        &.divider {
-          height: 1px;
-          overflow: hidden;
-          background: #222;
-          background: rgba(0,0,0,.2);
-          border-bottom: 1px solid rgba(255,255,255,.1);
-          margin: 5px 0;
-        }
-
-        // Section separaters
-        span {
-          clear: both;
-          display: block;
-          background: rgba(0,0,0,.2);
-          padding: 6px 15px;
-          cursor: default;
-          color: @gray;
-          border-top: 1px solid rgba(0,0,0,.2);
-        }
+    &.active > a {
+      background-color: #fff;
+      padding: 0 14px;
+      border: 1px solid #ddd;
+      border-bottom: 0;
+      color: @gray;
+    }
+  }
+  .dropdown-menu {
+    top: 35px;
+    border-width: 1px;
+    .border-radius(0 6px 6px 6px);
+  }
+  .dropdown-toggle:after {
+    border-top-color: #999;
+    margin-top: 15px;
+    margin-left: 5px;
+  }
+  .dropdown.open .dropdown-toggle:after {
+    border-top-color: #555;
+  }
+}
+
+// Basic pill nav
+.pills {
+  li {
+    a {
+      margin: 5px 3px 5px 0;
+      padding: 0 15px;
+      text-shadow: 0 1px 1px #fff;
+      line-height: 30px;
+      .border-radius(15px);
+      &:hover {
+        background: @linkColorHover;
+        color: #fff;
+        text-decoration: none;
+        text-shadow: 0 1px 1px rgba(0,0,0,.25);
       }
     }
+    &.active a {
+      background: @linkColor;
+      color: #fff;
+      text-shadow: 0 1px 1px rgba(0,0,0,.25);
+    }
   }
 }
 
@@ -450,74 +512,6 @@ input[type=submit].btn {
   }
 }
 
-// NAVIGATION
-// ----------
-
-// Common tab and pill styles
-.tabs,
-.pills {
-  margin: 0 0 20px;
-  padding: 0;
-  .clearfix();
-  li {
-    display: inline;
-    a {
-      float: left;
-      width: auto;
-    }
-  }
-}
-
-// Basic Tabs
-.tabs {
-  width: 100%;
-  border-bottom: 1px solid @grayLight;
-  li {
-    a {
-      margin-bottom: -1px;
-      margin-right: 2px;
-      padding: 0 15px;
-      line-height: (@baseline * 2) - 1;
-      .border-radius(3px 3px 0 0);
-      &:hover {
-        background-color: @grayLighter;
-        border-bottom: 1px solid @grayLight;
-      }
-    }
-    &.active a {
-      background-color: #fff;
-      padding: 0 14px;
-      border: 1px solid #ccc;
-      border-bottom: 0;
-      color: @gray;
-    }
-  }
-}
-
-// Basic pill nav
-.pills {
-  li {
-    a {
-      margin: 5px 3px 5px 0;
-      padding: 0 15px;
-      text-shadow: 0 1px 1px #fff;
-      line-height: 30px;
-      .border-radius(15px);
-      &:hover {
-        background: @linkColorHover;
-        color: #fff;
-        text-decoration: none;
-        text-shadow: 0 1px 1px rgba(0,0,0,.25);
-      }
-    }
-    &.active a {
-      background: @linkColor;
-      color: #fff;
-      text-shadow: 0 1px 1px rgba(0,0,0,.25);
-    }
-  }
-}
-
 
 // PAGINATION
 // ----------
@@ -748,4 +742,4 @@ input[type=submit].btn {
       margin-bottom: 0;
     }
   }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From b552281558be2ae54e71df064527af5239c494ab Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 26 Aug 2011 23:18:39 -0700
Subject: make dropdowns in the topbar black again

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index f5ca099cb..cc25b120c 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -105,6 +105,8 @@
 
 // NAVIGATION
 // ----------
+
+// Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
 .nav {
   display: block;
@@ -112,11 +114,6 @@
   margin: 0 10px 0 0;
   position: relative;
   left: 0;
-  &.secondary-nav {
-    float: right;
-    margin-left: 10px;
-    margin-right: 0;
-  }
   li {
     display: block;
     float: left;
@@ -138,9 +135,42 @@
     }
   }
 
+  // Secondary (floated right) nav in topbar
+  &.secondary-nav {
+    float: right;
+    margin-left: 10px;
+    margin-right: 0;
+    .dropdown .dropdown-menu {
+      right: 0;
+    }
+  }
   // Dropdowns within the .nav
-  &.secondary-nav li .dropdown-menu {
-    right: 0;
+  .dropdown-toggle:hover,
+  .dropdown.open .dropdown-toggle {
+    background-color: #444;
+    background-color: rgba(255,255,255,.05);
+    *background-color: #444; // IE6-7
+  }
+  .dropdown-menu {
+    background-color: #333;
+    .dropdown-toggle {
+      color: #fff;
+      &.open {
+        background-color: rgba(255,255,255,.05);
+      }
+    }
+    li a {
+      color: #999;
+      text-shadow: 0 1px 0 rgba(0,0,0,.5);
+      &:hover {
+        #gradient > .vertical(#292929,#191919);
+        color: #fff;
+      }
+    }
+    .divider {
+      background-color: #222;
+      border-color: #444;
+    }
   }
 }
 
@@ -223,6 +253,7 @@
 .dropdown.open {
   .dropdown-toggle {
     color: #fff;
+    background-color: #ccc;
     background-color: rgba(0,0,0,.3);
   }
   .dropdown-menu {
@@ -230,6 +261,7 @@
   }
 }
 
+
 // Tabs and Pills
 .tabs,
 .pills {
-- 
cgit v1.2.3


From 650251228bfda8d57a09b4b350ce2b9f1e0efcc1 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sat, 27 Aug 2011 15:30:18 -0700
Subject: redefine the grid to use attribute selectors with css regex, make
 previously fixed grid values use variables we use elsewhere

---
 lib/patterns.less    |  2 +-
 lib/preboot.less     |  2 +-
 lib/scaffolding.less | 30 +++++++++++-------------------
 3 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index cc25b120c..9dabd22c9 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -434,7 +434,7 @@ footer {
   }
 
   &:active {
-    @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
+    @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
   }
 
diff --git a/lib/preboot.less b/lib/preboot.less
index 75e75020b..f5d5a48d1 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -36,7 +36,7 @@
 @gridColumns:       16;
 @gridColumnWidth:   40px;
 @gridGutterWidth:   20px;
-@extraSpace:        40px;
+@extraSpace:        (@gridGutterWidth * 2); // For our grid calculations
 @siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
 // Color Scheme
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index d1b621c13..0833e0c83 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -9,28 +9,14 @@
 
 .row {
   .clearfix();
-  margin-left: -20px;
+  margin-left: -1 * @gridGutterWidth;
 
-  // Default columns
-  .span1,
-  .span2,
-  .span3,
-  .span4,
-  .span5,
-  .span6,
-  .span7,
-  .span8,
-  .span9,
-  .span10,
-  .span11,
-  .span12,
-  .span13,
-  .span14,
-  .span15,
-  .span16 {
+  // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
+  // Credit to @dhg for the idea
+  [class^="span"] {
     display: inline;
     float: left;
-    margin-left: 20px;
+    margin-left: @gridGutterWidth;
   }
 
   // Default columns
@@ -64,6 +50,12 @@
   .offset10  { .offset(10); }
   .offset11  { .offset(11); }
   .offset12  { .offset(12); }
+
+  // Unique column sizes for 16-column grid
+  .span-one-third     { width: 300px; }
+  .span-two-thirds    { width: 620px; }
+  .offset-one-third   { margin-left: 320px; }
+  .offset-two-thirds  { margin-left: 640px; }
 }
 
 
-- 
cgit v1.2.3


From 654cc5ad3fbbc618375a39f42ce9603c7f6897c4 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Mon, 29 Aug 2011 21:24:00 -0700
Subject: resolving deltas between that epic css selector specifity pull
 request and latest changes here

---
 lib/patterns.less | 322 +++++++++++++++++++++++++++---------------------------
 1 file changed, 158 insertions(+), 164 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 9dabd22c9..219e26b3f 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -17,7 +17,7 @@
   overflow: visible;
 
   // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
-  .wrapper {
+  .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);
@@ -32,7 +32,7 @@
 
   // Hover and active states
   a:hover,
-  ul li.active a {
+  ul .active a {
     background-color: #333;
     background-color: rgba(255,255,255,.05);
     color: @white;
@@ -60,44 +60,44 @@
     margin: 5px 0 0 0;
     position: relative;
     .opacity(100);
-    input {
-      background-color: #444;
-      background-color: rgba(255,255,255,.3);
-      #font > .sans-serif(13px, normal, 1);
-      width: 220px;
-      padding: 4px 9px;
-      color: #fff;
-      color: rgba(255,255,255,.75);
-      border: 1px solid #111;
-      .border-radius(4px);
-      @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
-      .box-shadow(@shadow);
-      .transition(none);
+  }
+  input {
+    background-color: #444;
+    background-color: rgba(255,255,255,.3);
+    #font > .sans-serif(13px, normal, 1);
+    width: 220px;
+    padding: 4px 9px;
+    color: #fff;
+    color: rgba(255,255,255,.75);
+    border: 1px solid #111;
+    .border-radius(4px);
+    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
+    .box-shadow(@shadow);
+    .transition(none);
 
-      // Placeholder text gets special styles; can't be bundled together though for some reason
-      &:-moz-placeholder {
-        color: @grayLighter;
-      }
-      &::-webkit-input-placeholder {
-        color: @grayLighter;
-      }
-      // Hover states
-      &:hover {
-        background-color: @grayLight;
-        background-color: rgba(255,255,255,.5);
-        color: #fff;
-      }
-      // Focus states (we use .focused since IE8 and down doesn't support :focus)
-      &:focus,
-      &.focused {
-        outline: none;
-        background-color: #fff;
-        color: @grayDark;
-        text-shadow: 0 1px 0 #fff;
-        border: 0;
-        padding: 5px 10px;
-        .box-shadow(0 0 3px rgba(0,0,0,.15));
-      }
+    // Placeholder text gets special styles; can't be bundled together though for some reason
+    &:-moz-placeholder {
+      color: @grayLighter;
+    }
+    &::-webkit-input-placeholder {
+      color: @grayLighter;
+    }
+    // Hover states
+    &:hover {
+      background-color: @grayLight;
+      background-color: rgba(255,255,255,.5);
+      color: #fff;
+    }
+    // Focus states (we use .focused since IE8 and down doesn't support :focus)
+    &:focus,
+    &.focused {
+      outline: none;
+      background-color: #fff;
+      color: @grayDark;
+      text-shadow: 0 1px 0 #fff;
+      border: 0;
+      padding: 5px 10px;
+      .box-shadow(0 0 3px rgba(0,0,0,.15));
     }
   }
 }
@@ -118,29 +118,29 @@
     display: block;
     float: left;
     font-size: 13px;
-    a {
-      display: block;
-      float: none;
-      padding: 10px 10px 11px;
-      line-height: 19px;
+  }
+  a {
+    display: block;
+    float: none;
+    padding: 10px 10px 11px;
+    line-height: 19px;
+    text-decoration: none;
+    &:hover {
+      color: #fff;
       text-decoration: none;
-      &:hover {
-        color: #fff;
-        text-decoration: none;
-      }
-    }
-    &.active a {
-      background-color: #222;
-      background-color: rgba(0,0,0,.5);
     }
   }
+  .active a {
+    background-color: #222;
+    background-color: rgba(0,0,0,.5);
+  }
 
   // Secondary (floated right) nav in topbar
   &.secondary-nav {
     float: right;
     margin-left: 10px;
     margin-right: 0;
-    .dropdown .dropdown-menu {
+    .dropdown-menu {
       right: 0;
     }
   }
@@ -221,33 +221,33 @@
     float: none;
     display: block;
     background-color: none;
-    // Links within the dropdown menu
-    a {
-      display: block;
-      padding: 4px 15px;
-      clear: both;
-      font-weight: normal;
-      line-height: 18px;
-      color: @gray;
-      text-shadow: 0 1px 0 #fff;
-      // Hover state
-      &:hover {
-        #gradient > .vertical(#eeeeee, #dddddd);
-        color: @grayDark;
-        text-decoration: none;
-        @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
-        .box-shadow(@shadow);
-      }
-    }
-    // Dividers (basically an hr) within the dropdown
-    &.divider {
-      height: 1px;
-      margin: 5px 0;
-      overflow: hidden;
-      background-color: #eee;
-      border-bottom: 1px solid #fff;
+  }
+  // Links within the dropdown menu
+  a {
+    display: block;
+    padding: 4px 15px;
+    clear: both;
+    font-weight: normal;
+    line-height: 18px;
+    color: @gray;
+    text-shadow: 0 1px 0 #fff;
+    // Hover state
+    &:hover {
+      #gradient > .vertical(#eeeeee, #dddddd);
+      color: @grayDark;
+      text-decoration: none;
+      @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
+      .box-shadow(@shadow);
     }
   }
+  // Dividers (basically an hr) within the dropdown
+  .divider {
+    height: 1px;
+    margin: 5px 0;
+    overflow: hidden;
+    background-color: #eee;
+    border-bottom: 1px solid #fff;
+  }
 }
 // Open state for the dropdown
 .dropdown.open {
@@ -320,26 +320,24 @@
 
 // Basic pill nav
 .pills {
-  li {
-    a {
+  a {
       margin: 5px 3px 5px 0;
-      padding: 0 15px;
-      text-shadow: 0 1px 1px #fff;
-      line-height: 30px;
-      .border-radius(15px);
-      &:hover {
-        background: @linkColorHover;
-        color: #fff;
-        text-decoration: none;
-        text-shadow: 0 1px 1px rgba(0,0,0,.25);
-      }
-    }
-    &.active a {
-      background: @linkColor;
+    padding: 0 15px;
+    text-shadow: 0 1px 1px #fff;
+    line-height: 30px;
+    .border-radius(15px);
+    &:hover {
+      background: @linkColorHover;
       color: #fff;
+      text-decoration: none;
       text-shadow: 0 1px 1px rgba(0,0,0,.25);
     }
   }
+  .active a {
+    background: @linkColor;
+    color: #fff;
+    text-shadow: 0 1px 1px rgba(0,0,0,.25);
+  }
 }
 
 
@@ -370,6 +368,7 @@ footer {
   border-top: 1px solid #eee;
 }
 
+
 // PAGE HEADERS
 // ------------
 
@@ -382,10 +381,10 @@ footer {
   }
 }
 
+
 // BUTTON STYLES
 // -------------
 
-
 // Base .btn styles
 .btn {
   // Button Base
@@ -424,7 +423,6 @@ footer {
     background-image: none;
     .opacity(65);
   }
-
   &:disabled {
     // disabled pseudo can't be included with .disabled
     // def because IE8 and below will drop it ;_;
@@ -432,7 +430,6 @@ footer {
     background-image: none;
     .opacity(65);
   }
-
   &:active {
     @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
@@ -445,12 +442,10 @@ footer {
     padding: 9px 14px 9px;
     .border-radius(6px);
   }
-
   &.small {
     padding: 7px 9px 7px;
     font-size: 11px;
   }
-
 }
 
 // Help Firefox not be a jerk about adding extra padding to buttons
@@ -463,7 +458,6 @@ input[type=submit].btn {
 }
 
 
-
 // ERROR STYLES
 // ------------
 
@@ -558,31 +552,31 @@ input[type=submit].btn {
     border: 1px solid rgba(0,0,0,.15);
     .border-radius(3px);
     .box-shadow(0 1px 2px rgba(0,0,0,.05));
-    li {
-      display: inline;
-      a {
-        float: left;
-        padding: 0 14px;
-        line-height: (@baseline * 2) - 2;
-        border-right: 1px solid;
-        border-right-color: #ddd;
-        border-right-color: rgba(0,0,0,.15);
-        *border-right-color: #ddd; /* IE6-7 */
-        text-decoration: none;
-      }
-      a:hover,
-      &.active a {
-        background-color: lighten(@blue, 45%);
-      }
-      &.disabled a,
-      &.disabled a:hover {
-        background-color: transparent;
-        color: @grayLight;
-      }
-      &.next a {
-        border: 0;
-      }
-    }
+  }
+  li {
+    display: inline;
+  }
+  a {
+    float: left;
+    padding: 0 14px;
+    line-height: (@baseline * 2) - 2;
+    border-right: 1px solid;
+    border-right-color: #ddd;
+    border-right-color: rgba(0,0,0,.15);
+    *border-right-color: #ddd; /* IE6-7 */
+    text-decoration: none;
+  }
+  a:hover,
+  .active a {
+    background-color: lighten(@blue, 45%);
+  }
+  .disabled a,
+  .disabled a:hover {
+    background-color: transparent;
+    color: @grayLight;
+  }
+  .next a {
+    border: 0;
   }
 }
 
@@ -628,33 +622,33 @@ input[type=submit].btn {
   .border-radius(6px);
   .box-shadow(0 3px 7px rgba(0,0,0,0.3));
   .background-clip(padding-box);
-  .modal-header {
-    border-bottom: 1px solid #eee;
-    padding: 5px 20px;
-    .close {
-      position: absolute;
-      right: 10px;
-      top: 10px;
-      color: #999;
-      line-height:10px;
-      font-size: 18px;
-    }
-  }
-  .modal-body {
-    padding: 20px;
+}
+.modal-header {
+  border-bottom: 1px solid #eee;
+  padding: 5px 20px;
+  .close {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    color: #999;
+    line-height:10px;
+    font-size: 18px;
   }
-  .modal-footer {
-    background-color: #f5f5f5;
-    padding: 14px 20px 15px;
-    border-top: 1px solid #ddd;
-    .border-radius(0 0 6px 6px);
-    .box-shadow(inset 0 1px 0 #fff);
-    .clearfix();
-    margin-bottom: 0;
-    .btn {
-      float: right;
-      margin-left: 10px;
-    }
+}
+.modal-body {
+  padding: 20px;
+}
+.modal-footer {
+  background-color: #f5f5f5;
+  padding: 14px 20px 15px;
+  border-top: 1px solid #ddd;
+  .border-radius(0 0 6px 6px);
+  .box-shadow(inset 0 1px 0 #fff);
+  .clearfix();
+  margin-bottom: 0;
+  .btn {
+    float: right;
+    margin-left: 10px;
   }
 }
 
@@ -712,20 +706,20 @@ input[type=submit].btn {
   &.left .twipsy-arrow    { #popoverArrow > .left(); }
   &.below .twipsy-arrow   { #popoverArrow > .below(); }
   &.right .twipsy-arrow   { #popoverArrow > .right(); }
-  .twipsy-inner {
-    padding: 3px 8px;
-    background-color: #000;
-    color: white;
-    text-align: center;
-    max-width: 200px;
-    text-decoration: none;
-    .border-radius(4px);
-  }
-  .twipsy-arrow {
-    position: absolute;
-    width: 0;
-    height: 0;
-  }
+}
+.twipsy-inner {
+  padding: 3px 8px;
+  background-color: #000;
+  color: white;
+  text-align: center;
+  max-width: 200px;
+  text-decoration: none;
+  .border-radius(4px);
+}
+.twipsy-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
 }
 
 
-- 
cgit v1.2.3


From f17fc367f724ef68e287c45c129558fb62fc6b8e Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Mon, 29 Aug 2011 21:26:53 -0700
Subject: le merging conflicts

---
 lib/adaptive.less    | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/scaffolding.less |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 lib/adaptive.less

(limited to 'lib')

diff --git a/lib/adaptive.less b/lib/adaptive.less
new file mode 100644
index 000000000..ef3054d3e
--- /dev/null
+++ b/lib/adaptive.less
@@ -0,0 +1,57 @@
+/* Responsive.less
+ * Adjusted grid styles to handle some common screen sizes
+ * ------------------------------------------------------- */
+
+
+// MOBILE PORTRAIT & LANDSCAPE
+// ---------------------------
+// For devices narrower than 480px
+@media only screen and (max-width: 480px) {
+
+  // Remove fixed width of containers
+  .container {
+    width: auto;
+    padding: 0 10px;
+  }
+
+  // Undo the floating of columns
+  .row {
+    margin-left: 0;
+  }
+  .row [class^="span"] {
+    float: none;
+    width: 100%;
+    display: block;
+    margin-left: 0;
+  }
+
+  // Stack form elements instead of floating them
+  fieldset legend {
+    margin-left: 0;
+  }
+  label {
+    float: none;
+    width: auto;
+    text-align: left;
+  }
+  div.input {
+    margin-left: 0;
+    width: 100%;
+  }
+  .input-xxlarge,
+  input.xxlarge,
+  textarea.xxlarge,
+  select.xxlarge {
+    width: 80%;
+  }
+
+  // Adjust modal
+  .modal-backdrop {
+    padding: 10px;
+  }
+  .modal {
+    width: 100%;
+    margin: 0;
+    left: auto;
+  }
+}
\ No newline at end of file
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 0833e0c83..2bbb1dc6c 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -46,7 +46,7 @@
   .offset6   { .offset(6); }
   .offset7   { .offset(7); }
   .offset8   { .offset(8); }
-  .offset9   { .offset(8); }
+  .offset9   { .offset(9); }
   .offset10  { .offset(10); }
   .offset11  { .offset(11); }
   .offset12  { .offset(12); }
-- 
cgit v1.2.3


From 589204803bc34575a8ca2c3e624864d3dc8e63ba Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 29 Aug 2011 21:41:12 -0700
Subject: remove duplicate defined btn class O_O

---
 lib/scaffolding.less | 88 +---------------------------------------------------
 1 file changed, 1 insertion(+), 87 deletions(-)

(limited to 'lib')

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 2bbb1dc6c..c0272908f 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -107,90 +107,4 @@ a {
     color: @linkColorHover;
     text-decoration: underline;
   }
-}
-
-// Buttons
-.btn {
-  display: inline-block;
-  #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
-  padding: 4px 14px;
-  text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  color: #333;
-  font-size: 13px;
-  line-height: @baseline;
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
-  .border-radius(4px);
-  @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
-  &:hover {
-    background-position: 0 -15px;
-    color: #333;
-    text-decoration: none;
-  }
-}
-.primary {
-  #gradient > .vertical(#049CDB, #0064CD);
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  border: 1px solid darken(#0064CD, 10%);
-  border-bottom-color: darken(#0064CD, 15%);
-  &:hover {
-    color: #fff;
-  }
-}
-
-.btn {
-  //.button(#1174C6);
-  .transition(.1s linear all);
-  &.primary {
-    //#gradient > .vertical(@blue, @blueDark);
-    color: #fff;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    border-color: @blueDark @blueDark darken(@blueDark, 15%);
-    border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-    &:hover {
-      color: #fff;
-    }
-  }
-  &.large {
-    font-size: 16px;
-    line-height: 28px;
-    .border-radius(6px);
-  }
-  &.small {
-    padding-right: 9px;
-    padding-left: 9px;
-    font-size: 11px;
-  }
-  &.disabled {
-    background-image: none;
-    .opacity(65);
-    cursor: default;
-    .box-shadow(none);
-  }
-
-  // this can't be included with the .disabled def because IE8 and below will drop it ;_;
-  &:disabled {
-    background-image: none;
-    .opacity(65);
-    cursor: default;
-    .box-shadow(none);
-    &.primary {
-      color: #fff;
-    }
-  }
-  &:active {
-    @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
-  }
-}
-
-// Help Firefox not be a jerk about adding extra padding to buttons
-button.btn,
-input[type=submit].btn {
-  &::-moz-focus-inner {
-  	padding: 0;
-  	border: 0;
-  }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 7070d44aed65344ed52ffbf2a3a9c1ce91c69035 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Mon, 29 Aug 2011 21:41:32 -0700
Subject: adding more grid docs

---
 lib/scaffolding.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 2bbb1dc6c..7fbab7d43 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -54,8 +54,8 @@
   // Unique column sizes for 16-column grid
   .span-one-third     { width: 300px; }
   .span-two-thirds    { width: 620px; }
-  .offset-one-third   { margin-left: 320px; }
-  .offset-two-thirds  { margin-left: 640px; }
+  .offset-one-third   { margin-left: 340px; }
+  .offset-two-thirds  { margin-left: 660px; }
 }
 
 
-- 
cgit v1.2.3


From d42a00c19df7442b3fa7c7703d333350a3dc74ac Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Mon, 29 Aug 2011 21:42:44 -0700
Subject: remove repeated table reset

---
 lib/reset.less | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'lib')

diff --git a/lib/reset.less b/lib/reset.less
index e79b77b40..9e2c6befe 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -133,14 +133,4 @@ input[type="search"]::-webkit-search-decoration {
 textarea {
   overflow: auto; // Remove vertical scrollbar in IE6-9
   vertical-align: top; // Readability and alignment cross-browser
-}
-
-// Tables
-// -------------------------
-// Source: http://github.com/necolas/normalize.css
-
-// Remove spacing between table cells
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From efd6fd609c7e1406d40906d4aa14949345a2d5ff Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 29 Aug 2011 22:36:05 -0700
Subject: fix open ui for ie 7

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 219e26b3f..dba5af3aa 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -157,6 +157,7 @@
       color: #fff;
       &.open {
         background-color: rgba(255,255,255,.05);
+        *background-color: #444; // IE6-7
       }
     }
     li a {
-- 
cgit v1.2.3


From afec7859cc08b7d57100ab7d96f11a9df5bdb32e Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 29 Aug 2011 22:43:40 -0700
Subject: fix background color for ie7 -- negative margin bug still there
 though ;_;

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index dba5af3aa..a4bc6b855 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -157,7 +157,6 @@
       color: #fff;
       &.open {
         background-color: rgba(255,255,255,.05);
-        *background-color: #444; // IE6-7
       }
     }
     li a {
@@ -256,6 +255,7 @@
     color: #fff;
     background-color: #ccc;
     background-color: rgba(0,0,0,.3);
+    *background-color: #ccc; /* ie6 -7 */
   }
   .dropdown-menu {
     display: block;
-- 
cgit v1.2.3


From ed1139e838110393748ee36cea4453cc4a700fb1 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 30 Aug 2011 08:27:55 -0700
Subject: change type of comment

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 219e26b3f..bcd99cca4 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -745,7 +745,7 @@ input[type=submit].btn {
   .inner {
     background-color: #333;
     background-color: rgba(0,0,0,.8);
-    *background-color: #333; /* IE 6-7 */
+    *background-color: #333; // IE 6-7
     padding: 3px;
     overflow: hidden;
     width: 280px;
-- 
cgit v1.2.3


From 2ed869c2eef1ad89a26ecfa187638db6f84774cd Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 30 Aug 2011 23:03:01 -0700
Subject: remove * hack for ie7 + remove -1 margin bug for ie7

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index a4bc6b855..f7f5d75bb 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -147,9 +147,8 @@
   // Dropdowns within the .nav
   .dropdown-toggle:hover,
   .dropdown.open .dropdown-toggle {
-    background-color: #444;
+    background: #444;
     background-color: rgba(255,255,255,.05);
-    *background-color: #444; // IE6-7
   }
   .dropdown-menu {
     background-color: #333;
@@ -253,9 +252,8 @@
 .dropdown.open {
   .dropdown-toggle {
     color: #fff;
-    background-color: #ccc;
+    background: #ccc;
     background-color: rgba(0,0,0,.3);
-    *background-color: #ccc; /* ie6 -7 */
   }
   .dropdown-menu {
     display: block;
@@ -284,8 +282,8 @@
   border-bottom: 1px solid #ddd;
   > li {
     position: relative; // For the dropdowns mostly
+    top: 1px;
     > a {
-      margin-bottom: -1px;
       margin-right: 2px;
       padding: 0 15px;
       line-height: (@baseline * 2) - 1;
@@ -744,9 +742,8 @@ input[type=submit].btn {
     height: 0;
   }
   .inner {
-    background-color: #333;
+    background: #333;
     background-color: rgba(0,0,0,.8);
-    *background-color: #333; /* IE 6-7 */
     padding: 3px;
     overflow: hidden;
     width: 280px;
-- 
cgit v1.2.3


From 49e343c464c931210e6ffc896fb7a511e5e773d0 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 30 Aug 2011 23:08:34 -0700
Subject: ie7 background toggle open

---
 lib/patterns.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index f7f5d75bb..c7397f094 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -155,6 +155,7 @@
     .dropdown-toggle {
       color: #fff;
       &.open {
+        background: #444;
         background-color: rgba(255,255,255,.05);
       }
     }
@@ -320,7 +321,7 @@
 // Basic pill nav
 .pills {
   a {
-      margin: 5px 3px 5px 0;
+    margin: 5px 3px 5px 0;
     padding: 0 15px;
     text-shadow: 0 1px 1px #fff;
     line-height: 30px;
-- 
cgit v1.2.3


From 588cb1c06d372817e7be2a44384b177bef660f53 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 30 Aug 2011 23:25:37 -0700
Subject: revert dhg mdo suggestion for fixing ie

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index c7397f094..38fbd8da0 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -147,16 +147,17 @@
   // Dropdowns within the .nav
   .dropdown-toggle:hover,
   .dropdown.open .dropdown-toggle {
-    background: #444;
+    background-color: #444;
     background-color: rgba(255,255,255,.05);
+    *background-color: #444; // IE6-7
   }
   .dropdown-menu {
     background-color: #333;
     .dropdown-toggle {
       color: #fff;
       &.open {
-        background: #444;
         background-color: rgba(255,255,255,.05);
+        *background-color: #444;
       }
     }
     li a {
@@ -253,8 +254,9 @@
 .dropdown.open {
   .dropdown-toggle {
     color: #fff;
-    background: #ccc;
+    background-color: #ccc;
     background-color: rgba(0,0,0,.3);
+    *background-color: #ccc; /* ie6 -7 */
   }
   .dropdown-menu {
     display: block;
@@ -321,7 +323,7 @@
 // Basic pill nav
 .pills {
   a {
-    margin: 5px 3px 5px 0;
+      margin: 5px 3px 5px 0;
     padding: 0 15px;
     text-shadow: 0 1px 1px #fff;
     line-height: 30px;
@@ -743,8 +745,9 @@ input[type=submit].btn {
     height: 0;
   }
   .inner {
-    background: #333;
+    background-color: #333;
     background-color: rgba(0,0,0,.8);
+    *background-color: #333; /* IE 6-7 */
     padding: 3px;
     overflow: hidden;
     width: 280px;
-- 
cgit v1.2.3


From 4fb1c5bd4b527797183a60e752f0276b01637fd5 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 30 Aug 2011 23:34:19 -0700
Subject: rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and
 fluid.html

---
 lib/bootstrap.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index aa0e24b96..c31bd725d 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v1.1.1
+ * Bootstrap v1.2.0
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0
-- 
cgit v1.2.3


From f6a4dd95b62771b105530c85a98901f06bfecdd7 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 31 Aug 2011 10:55:53 -0700
Subject: try daves background thing again...

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 38fbd8da0..91294103c 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -147,17 +147,16 @@
   // Dropdowns within the .nav
   .dropdown-toggle:hover,
   .dropdown.open .dropdown-toggle {
-    background-color: #444;
-    background-color: rgba(255,255,255,.05);
-    *background-color: #444; // IE6-7
+    background: #444;
+    background: rgba(255,255,255,.05);
   }
   .dropdown-menu {
     background-color: #333;
     .dropdown-toggle {
       color: #fff;
       &.open {
-        background-color: rgba(255,255,255,.05);
-        *background-color: #444;
+        background: #444;
+        background: rgba(255,255,255,.05);
       }
     }
     li a {
@@ -254,9 +253,8 @@
 .dropdown.open {
   .dropdown-toggle {
     color: #fff;
-    background-color: #ccc;
-    background-color: rgba(0,0,0,.3);
-    *background-color: #ccc; /* ie6 -7 */
+    background: #ccc;
+    background: rgba(0,0,0,.3);
   }
   .dropdown-menu {
     display: block;
@@ -745,9 +743,8 @@ input[type=submit].btn {
     height: 0;
   }
   .inner {
-    background-color: #333;
-    background-color: rgba(0,0,0,.8);
-    *background-color: #333; /* IE 6-7 */
+    background: #333;
+    background: rgba(0,0,0,.8);
     padding: 3px;
     overflow: hidden;
     width: 280px;
-- 
cgit v1.2.3


From 6258832776b113b09e963680ef121b363dd8d292 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Wed, 31 Aug 2011 16:26:47 -0700
Subject: spelling mistakes and undo of one comment

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index bcd99cca4..219e26b3f 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -745,7 +745,7 @@ input[type=submit].btn {
   .inner {
     background-color: #333;
     background-color: rgba(0,0,0,.8);
-    *background-color: #333; // IE 6-7
+    *background-color: #333; /* IE 6-7 */
     padding: 3px;
     overflow: hidden;
     width: 280px;
-- 
cgit v1.2.3


From 72da5dd54d154bb2b87b0ec23107eca775c72f51 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 1 Sep 2011 22:53:24 -0700
Subject: for html5 style all inputs -- then unstyle checkbox, radio, button,
 reset, submit

---
 lib/forms.less | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/forms.less b/lib/forms.less
index 88ae08d8a..d79decd24 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -61,8 +61,7 @@ input[type=radio] {
 }
 
 // Inputs, Textareas, Selects
-input[type=text],
-input[type=password],
+input,
 textarea,
 select,
 .uneditable-input {
@@ -76,14 +75,40 @@ select,
   border: 1px solid #ccc;
   .border-radius(3px);
 }
+
+/* mini reset for non-html5 file types */
+input[type=checkbox],
+input[type=radio] {
+  width: auto;
+  padding: 0;
+  line-height: normal;
+  height: auto;
+  margin: 3px 0;
+}
+
+input[type=file] {
+  border: 0;
+  padding: 0;
+  .box-shadow(none);
+}
+
+input[type=button],
+input[type=reset],
+input[type=submit] {
+  width: auto;
+  height: auto;
+}
+
 select,
 input[type=file] {
   height: @baseline * 1.5;
   line-height: @baseline * 1.5;
 }
+
 textarea {
   height: auto;
 }
+
 .uneditable-input {
   background-color: #eee;
   display: block;
@@ -100,15 +125,13 @@ textarea {
 }
 
 // Focus states
-input[type=text],
-input[type=password],
+input,
 select, textarea {
   @transition: border linear .2s, box-shadow linear .2s;
   .transition(@transition);
   .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
 }
-input[type=text]:focus,
-input[type=password]:focus,
+input:focus,
 textarea:focus {
   outline: none;
   border-color: rgba(82,168,236,.8);
@@ -128,8 +151,7 @@ form div.error {
   span.help-block {
     color: @red;
   }
-  input[type=text],
-  input[type=password],
+  input,
   textarea {
     border-color: @error-text;
     .box-shadow(0 0 3px rgba(171,41,32,.25));
@@ -221,7 +243,7 @@ input.disabled {
 // Inline Fields (input fields that appear as inline objects
 .inline-inputs {
   color: @gray;
-  span, input[type=text] {
+  span, input {
     display: inline-block;
   }
   input.mini {
@@ -238,8 +260,7 @@ input.disabled {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
-  input[type=text],
-  input[type=password] {
+  input {
     .border-radius(0 3px 3px 0);
   }
   .add-on {
@@ -270,8 +291,7 @@ input.disabled {
   }
 }
 .input-append {
-  input[type=text],
-  input[type=password] {
+  input {
     float: left;
     .border-radius(3px 0 0 3px);
   }
-- 
cgit v1.2.3


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 +
 lib/scaffolding.less | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

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
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 7f2af56ba..b84b43721 100644
--- a/lib/scaffolding.less
+++ b/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)
@@ -107,4 +106,4 @@ a {
     color: @linkColorHover;
     text-decoration: underline;
   }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 0ed544a82ed8bf3758de2f57af1abd54202d38f3 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 2 Sep 2011 00:17:13 -0700
Subject: backwards compat for old nav o_O

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 91294103c..a5a88a4f6 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -108,7 +108,7 @@
 
 // Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
-.nav {
+.topbar ul, .nav {
   display: block;
   float: left;
   margin: 0 10px 0 0;
-- 
cgit v1.2.3


From 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 2 Sep 2011 00:21:55 -0700
Subject: > seems to work O_O

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index a5a88a4f6..2e1a250a5 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -108,7 +108,7 @@
 
 // Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
-.topbar ul, .nav {
+.topbar > ul, .nav {
   display: block;
   float: left;
   margin: 0 10px 0 0;
-- 
cgit v1.2.3


From c098225cd52e212911c6eb1b71a23b7e8eb726ad Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 2 Sep 2011 00:26:58 -0700
Subject: this works O_O

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 2e1a250a5..eeeb214fd 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -108,7 +108,7 @@
 
 // Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
-.topbar > ul, .nav {
+.topbar h3 ~ ul, .nav {
   display: block;
   float: left;
   margin: 0 10px 0 0;
-- 
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')

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')

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


From 462287e25e0c2295884ad0d2cab31b0cd0b90b26 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 2 Sep 2011 00:31:19 -0700
Subject: div > ul ftw

---
 lib/patterns.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index eeeb214fd..77b16de7b 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -108,7 +108,8 @@
 
 // Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
-.topbar h3 ~ ul, .nav {
+.topbar div > ul,
+.nav {
   display: block;
   float: left;
   margin: 0 10px 0 0;
-- 
cgit v1.2.3


From 813c55489ff2f81eb46e859c93f089114a116e40 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 2 Sep 2011 00:42:22 -0700
Subject: fix for dropdown

---
 lib/patterns.less | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 29870dc30..da59ce15a 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -224,6 +224,17 @@
     display: block;
     background-color: none;
   }
+  // Dividers (basically an hr) within the dropdown
+  .divider {
+    height: 1px;
+    margin: 5px 0;
+    overflow: hidden;
+    background-color: #eee;
+    border-bottom: 1px solid #fff;
+  }
+}
+
+.topbar .dropdown-menu, .dropdown-menu {
   // Links within the dropdown menu
   a {
     display: block;
@@ -242,15 +253,8 @@
       .box-shadow(@shadow);
     }
   }
-  // Dividers (basically an hr) within the dropdown
-  .divider {
-    height: 1px;
-    margin: 5px 0;
-    overflow: hidden;
-    background-color: #eee;
-    border-bottom: 1px solid #fff;
-  }
 }
+
 // Open state for the dropdown
 .dropdown.open {
   .dropdown-toggle {
-- 
cgit v1.2.3


From fa94b264fa9b552427a349235e176543af4be6d1 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 00:50:05 -0700
Subject: add temp second topbar to nav section, fix it's compatibility issues

---
 lib/patterns.less | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index fbb00d8a0..b1e2cfe05 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -96,7 +96,7 @@
 
 // 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
+.topbar .fill { // For backwards compatibility
   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);
@@ -109,8 +109,8 @@
 
 // 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 compatibility, leave in .topbar div > ul
+.topbar div > ul,
 .nav {
   display: block;
   float: left;
@@ -147,13 +147,20 @@
     }
   }
   // Dropdowns within the .nav
+  // a.menu:hover and li.open .menu for backwards compatibility
+  a.menu:hover,
+  li.open .menu,
   .dropdown-toggle:hover,
   .dropdown.open .dropdown-toggle {
     background: #444;
     background: rgba(255,255,255,.05);
   }
+  // .menu-dropdown for backwards compatibility
+  .menu-dropdown,
   .dropdown-menu {
     background-color: #333;
+    // a.menu for backwards compatibility
+    a.menu,
     .dropdown-toggle {
       color: #fff;
       &.open {
@@ -176,12 +183,22 @@
   }
 }
 
+// For backwards compatability with new dropdowns, redeclare dropdown link padding
+.topbar ul .menu-dropdown li a,
+.topbar ul .dropdown-menu li a {
+  padding: 4px 15px;
+}
+
 // Dropdown Menus
 // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
+// li.menu for backwards compatibility
+li.menu,
 .dropdown {
   position: relative;
 }
 // The link that is clicked to toggle the dropdown
+// a.menu for backwards compatibility
+a.menu:after,
 .dropdown-toggle:after {
   width: 0;
   height: 0;
@@ -197,6 +214,8 @@
   .opacity(50);
 }
 // The dropdown menu (ul)
+// .menu-dropdown for backwards compatibility
+.menu-dropdown,
 .dropdown-menu {
   background-color: #fff;
   float: left;
@@ -252,12 +271,18 @@
   }
 }
 // Open state for the dropdown
+// .open for backwards compatibility
+.open,
 .dropdown.open {
+  // .menu for backwards compatibility
+  .menu,
   .dropdown-toggle {
     color: #fff;
     background: #ccc;
     background: rgba(0,0,0,.3);
   }
+  // .menu-dropdown for backwards compatibility
+  .menu-dropdown,
   .dropdown-menu {
     display: block;
   }
-- 
cgit v1.2.3


From 46e4fb31338807be1535208fb07dfc3fff89fe08 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 00:56:03 -0700
Subject: remove active state from buttons by moving the :active before
 :disabled

---
 lib/patterns.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 013566b81..578b02826 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -450,6 +450,10 @@ footer {
   .transition(.1s linear all);
 
   // Active and Disabled states
+  &:active {
+    @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
+    .box-shadow(@shadow);
+  }
   &.disabled {
     cursor: default;
     background-image: none;
@@ -464,10 +468,6 @@ footer {
     .opacity(65);
     .box-shadow(none);
   }
-  &:active {
-    @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
-  }
 
   // Button Sizes
   &.large {
-- 
cgit v1.2.3


From 411e32434095c9b6e9def4114d84df371e8e5d20 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 00:58:07 -0700
Subject: fix dropdown bug, remove second topbar from docs now

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 578b02826..a897b2f16 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -143,6 +143,8 @@
     float: right;
     margin-left: 10px;
     margin-right: 0;
+    // backwards compatibility
+    .menu-dropdown,
     .dropdown-menu {
       right: 0;
     }
-- 
cgit v1.2.3


From db830140eea8e38c09cb80ff970f197b7ea1a11a Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 01:03:16 -0700
Subject: add old dropdown support to tabs dropdowns

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index a897b2f16..263f1ac4c 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -337,16 +337,22 @@ a.menu:after,
       color: @gray;
     }
   }
+  // first one for backwards compatibility
+  .menu-dropdown,
   .dropdown-menu {
     top: 35px;
     border-width: 1px;
     .border-radius(0 6px 6px 6px);
   }
+  // first one for backwards compatibility
+  a.menu:after,
   .dropdown-toggle:after {
     border-top-color: #999;
     margin-top: 15px;
     margin-left: 5px;
   }
+  // first one for backwards compatibility
+  li.open a.menu:after,
   .dropdown.open .dropdown-toggle:after {
     border-top-color: #555;
   }
-- 
cgit v1.2.3


From e6ffd3a86fcc3585cf2291b151fb4625f435586e Mon Sep 17 00:00:00 2001
From: pthrasher <philipthrasher@gmail.com>
Date: Fri, 2 Sep 2011 10:43:26 -0400
Subject: Fix for issue #136. Now nests fine in both layouts.

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index d0e4cda12..83d7c5428 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -742,6 +742,9 @@ input[type=submit].btn {
   .content {
     background-color: @white;
     padding: 14px;
+    min-width:inherit;
+    max-width:inherit;
+    margin:auto;
     .border-radius(0 0 3px 3px);
     .background-clip(padding-box);
     p, ul, ol {
-- 
cgit v1.2.3


From 3f2292514431b5ac4ca00776ff8348b5ca4c662b Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 09:35:26 -0700
Subject: remove fixed width from topbar form to allow for applying classes to
 resize it

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

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 263f1ac4c..9213a7699 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -57,7 +57,6 @@
     background-color: #444;
     background-color: rgba(255,255,255,.3);
     #font > .sans-serif(13px, normal, 1);
-    width: 220px;
     padding: 4px 9px;
     color: #fff;
     color: rgba(255,255,255,.75);
-- 
cgit v1.2.3


From 5960afc3490a174cadaf3bc0f4fe3cf605666756 Mon Sep 17 00:00:00 2001
From: pthrasher <philipthrasher@gmail.com>
Date: Fri, 2 Sep 2011 12:45:03 -0400
Subject: incorporated idea from @markdotto in #138

---
 lib/patterns.less    | 3 ---
 lib/scaffolding.less | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 83d7c5428..d0e4cda12 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -742,9 +742,6 @@ input[type=submit].btn {
   .content {
     background-color: @white;
     padding: 14px;
-    min-width:inherit;
-    max-width:inherit;
-    margin:auto;
     .border-radius(0 0 3px 3px);
     .background-clip(padding-box);
     p, ul, ol {
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index ded9a1e5f..5863659c2 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -90,11 +90,11 @@ body {
 .container-fluid {
   padding: 0 20px;
   .clearfix();
-  .sidebar {
+  > .sidebar {
     float: left;
     width: 220px;
   }
-  .content {
+  > .content {
     min-width: 700px;
     max-width: 1180px;
     margin-left: 240px;
-- 
cgit v1.2.3


From 62f891640714d86e1c26a0d5c9da9ee63ac22f21 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 11:53:58 -0700
Subject: update the file input to undo the damage of the generic input
 selector

---
 lib/forms.less | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/forms.less b/lib/forms.less
index d79decd24..3fc62f93d 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -67,10 +67,10 @@ select,
 .uneditable-input {
   display: inline-block;
   width: 210px;
+  height: @baseline;
   padding: 4px;
   font-size: 13px;
   line-height: @baseline;
-  height: @baseline;
   color: @gray;
   border: 1px solid #ccc;
   .border-radius(3px);
@@ -80,15 +80,18 @@ select,
 input[type=checkbox],
 input[type=radio] {
   width: auto;
-  padding: 0;
-  line-height: normal;
   height: auto;
+  padding: 0;
   margin: 3px 0;
+  line-height: normal;
+  border: none;
 }
 
 input[type=file] {
-  border: 0;
-  padding: 0;
+  background-color: #fff;
+  padding: initial;
+  border: initial;
+  line-height: initial;
   .box-shadow(none);
 }
 
-- 
cgit v1.2.3


From 60409660d7537a83b6e1d6d66f9aa97e6c531f77 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 2 Sep 2011 12:01:41 -0700
Subject: \9 for 8 or less ie

---
 lib/preboot.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/preboot.less b/lib/preboot.less
index 9a1d88b2c..96bca8688 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -240,7 +240,7 @@
     background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
     background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(top, @startColor, @endColor); // The standard
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor));
   }
   .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
     background-color: @endColor;
@@ -260,6 +260,7 @@
     background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor));
   }
 }
 
-- 
cgit v1.2.3


From b9a53b146811ed5cc844aebf563d48bf5b6d2bc5 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 12:02:20 -0700
Subject: button tweaks

---
 lib/patterns.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 9213a7699..c574b9c1e 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -429,7 +429,8 @@ footer {
   // Button Base
   cursor: pointer;
   display: inline-block;
-  #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
+  //#gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
+  #gradient > .vertical(#ffffff, #eeeeee);
   padding: 5px 14px 6px;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   color: #333;
-- 
cgit v1.2.3


From 8c1e60c638ba9f2c564f9c0f05c255a673672a5e Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 12:19:43 -0700
Subject: add reset filter to preboot for turning off gradients in IE when
 necessary; make :disabled [disabled] for crossbrowser usage

---
 lib/patterns.less | 7 ++++---
 lib/preboot.less  | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index c574b9c1e..6749633bb 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -429,8 +429,7 @@ footer {
   // Button Base
   cursor: pointer;
   display: inline-block;
-  //#gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
-  #gradient > .vertical(#ffffff, #eeeeee);
+  #gradient > .vertical-three-colors(#ffffff, #ffffff, 0.25, darken(#ffffff, 10%));
   padding: 5px 14px 6px;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   color: #333;
@@ -465,14 +464,16 @@ footer {
   &.disabled {
     cursor: default;
     background-image: none;
+    .reset-filter();
     .opacity(65);
     .box-shadow(none);
   }
-  &:disabled {
+  &[disabled] {
     // disabled pseudo can't be included with .disabled
     // def because IE8 and below will drop it ;_;
     cursor: default;
     background-image: none;
+    .reset-filter();
     .opacity(65);
     .box-shadow(none);
   }
diff --git a/lib/preboot.less b/lib/preboot.less
index 96bca8688..b92acb9d3 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -240,7 +240,7 @@
     background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
     background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(top, @startColor, @endColor); // The standard
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor));
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor)); // IE8 and down
   }
   .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
     background-color: @endColor;
@@ -260,10 +260,15 @@
     background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor));
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor)); // IE8 and down, gets no color-stop at all for proper fallback
   }
 }
 
+// Reset filters for IE
+.reset-filter() {
+  filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
+}
+
 // Opacity
 .opacity(@opacity: 100) {
 	filter: e(%("alpha(opacity=%d)", @opacity));
-- 
cgit v1.2.3


From cb244d5d51f910ac891f4a3a4691cd0740dc8307 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 12:31:14 -0700
Subject: fix docs.css spacing, add gradient support for ie9 back

---
 lib/patterns.less | 1 +
 lib/preboot.less  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 6749633bb..96e401058 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -550,6 +550,7 @@ input[type=submit].btn {
   &.block-message {
     background-image: none;
     background-color: lighten(#fceec1, 5%);
+    .reset-filter();
     padding: 14px;
     border-color: #fceec1;
     .box-shadow(none);
diff --git a/lib/preboot.less b/lib/preboot.less
index b92acb9d3..d270cab05 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -229,6 +229,7 @@
     background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
     background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(left, @startColor, @endColor); // Le standard
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down
   }
   .vertical (@startColor: #555, @endColor: #333) {
     background-color: @endColor;
@@ -240,7 +241,7 @@
     background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
     background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(top, @startColor, @endColor); // The standard
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor)); // IE8 and down
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
   }
   .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
     background-color: @endColor;
@@ -260,7 +261,7 @@
     background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\9",@startColor,@endColor)); // IE8 and down, gets no color-stop at all for proper fallback
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
   }
 }
 
-- 
cgit v1.2.3


From 2f4c84bba976344b8fe198a7613184e32231b66a Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 12:35:41 -0700
Subject: remove rounded corners on buttons from IE9 so gradients don't bleed
 out

---
 lib/patterns.less | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 96e401058..2948c1e2d 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -429,7 +429,7 @@ footer {
   // Button Base
   cursor: pointer;
   display: inline-block;
-  #gradient > .vertical-three-colors(#ffffff, #ffffff, 0.25, darken(#ffffff, 10%));
+  #gradient > .vertical-three-colors(#ffffff, #ffffff, 0.25, darken(#ffffff, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
   padding: 5px 14px 6px;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   color: #333;
@@ -490,6 +490,11 @@ footer {
     font-size: 11px;
   }
 }
+// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
+:root .alert-message,
+:root .btn {
+  border-radius: 0 \0;
+}
 
 // Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
-- 
cgit v1.2.3


From 298e1b59bbf389ba8ec45de6428f1128ac71114c Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 12:46:47 -0700
Subject: fix broken checkbox in ie7

---
 lib/forms.less    | 1 +
 lib/patterns.less | 2 +-
 lib/preboot.less  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/forms.less b/lib/forms.less
index 3fc62f93d..a16844ab1 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -83,6 +83,7 @@ input[type=radio] {
   height: auto;
   padding: 0;
   margin: 3px 0;
+  *margin-top: 0; /* IE6-7 */
   line-height: normal;
   border: none;
 }
diff --git a/lib/patterns.less b/lib/patterns.less
index 2948c1e2d..413f82178 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -429,7 +429,7 @@ footer {
   // Button Base
   cursor: pointer;
   display: inline-block;
-  #gradient > .vertical-three-colors(#ffffff, #ffffff, 0.25, darken(#ffffff, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
+  #gradient > .vertical-three-colors(#ffffff, #ffffff, 25%, darken(#ffffff, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
   padding: 5px 14px 6px;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   color: #333;
diff --git a/lib/preboot.less b/lib/preboot.less
index d270cab05..a922f569c 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -257,7 +257,7 @@
     background-repeat: no-repeat;
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
     background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
     background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
-- 
cgit v1.2.3