merging in remote and recompiling

3 files changed, 10 insertions, 97 deletions

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
diff --git a/lib/patterns.less b/lib/patterns.less
index 219e26b3f..91294103c 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -147,16 +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: #444;
+        background: rgba(255,255,255,.05);
       }
     }
     li a {
@@ -253,8 +253,8 @@
 .dropdown.open {
   .dropdown-toggle {
     color: #fff;
-    background-color: #ccc;
-    background-color: rgba(0,0,0,.3);
+    background: #ccc;
+    background: rgba(0,0,0,.3);
   }
   .dropdown-menu {
     display: block;
@@ -283,8 +283,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;
@@ -743,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;
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 7fbab7d43..7f2af56ba 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -108,89 +108,3 @@ a {
     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;
-  }
-}