Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css

1 files changed, 25 insertions, 100 deletions

diff --git a/lib/patterns.less b/lib/patterns.less
index 44c427adf..7c9ee7e48 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -24,11 +24,6 @@
 }
 // Text and links
 .navbar {
-  // Links get text-shadow
-  a {
-    color: @grayLight;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  }
   // Hover and active states
   .brand a:hover,
   ul .active > a {
@@ -57,6 +52,10 @@
       background-color: transparent;
     }
   }
+  // Buttons in navbar
+  .btn {
+    margin-top: 5px; // make buttons vertically centered in navbar
+  }
 }
 
 // Navbar search
@@ -146,7 +145,9 @@
     float: none;
     padding: 10px 10px 11px;
     line-height: 19px;
+    color: @grayLight;
     text-decoration: none;
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     &:hover {
       color: @white;
       text-decoration: none;
@@ -213,101 +214,6 @@
   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
-.dropdown {
-  position: relative;
-}
-// The link that is clicked to toggle the dropdown
-.dropdown-toggle:after {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  margin-top: 8px;
-  margin-left: 6px;
-  text-indent: -99999px;
-  vertical-align: top;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid @white;
-  .opacity(30);
-  content: "&darr;";
-}
-.dropdown:hover .dropdown-toggle:after {
-  .opacity(100);
-}
-// The dropdown menu (ul)
-.dropdown-menu {
-  position: absolute;
-  top: 40px;
-  z-index: 900;
-  float: left;
-  display: none; // None by default, but block on "open" of the menu
-  min-width: 160px;
-  max-width: 220px;
-  _width: 160px;
-  padding: 6px 0;
-  margin-left: 0; // override default ul styles
-  margin-right: 0;
-  background-color: @white;
-  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);
-  zoom: 1; // do we need this?
-
-  // Unfloat any li's to make them stack
-  li {
-    float: none;
-    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 @white;
-  }
-}
-
-.topbar .dropdown-menu, .dropdown-menu {
-  // 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 @white;
-    // Hover state
-    &:hover {
-      color: @grayDark;
-      text-decoration: none;
-      #gradient > .vertical(#eeeeee, #dddddd);
-      @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
-      .box-shadow(@shadow);
-    }
-  }
-}
-
-// Open state for the dropdown
-.dropdown.open {
-  .dropdown-toggle {
-    color: @white;
-    background: #ccc;
-    background: rgba(0,0,0,.3);
-  }
-  .dropdown-menu {
-    display: block;
-  }
-}
-
 
 
 
@@ -493,6 +399,7 @@ input[type=submit].btn {
   float: left;
   margin-left: -1px;
   .border-radius(0);
+  // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
   &:first-child {
     margin-left: 0;
        -webkit-border-top-left-radius: 4px;
@@ -510,6 +417,24 @@ input[type=submit].btn {
         -moz-border-radius-bottomright: 4px;
             border-bottom-right-radius: 4px;
   }
+  // Reset corners for large buttons
+  &.large:first-child {
+    margin-left: 0;
+       -webkit-border-top-left-radius: 6px;
+           -moz-border-radius-topleft: 6px;
+               border-top-left-radius: 6px;
+    -webkit-border-bottom-left-radius: 6px;
+        -moz-border-radius-bottomleft: 6px;
+            border-bottom-left-radius: 6px;
+  }
+  &.large:last-child {
+       -webkit-border-top-right-radius: 6px;
+           -moz-border-radius-topright: 6px;
+               border-top-right-radius: 6px;
+    -webkit-border-bottom-right-radius: 6px;
+        -moz-border-radius-bottomright: 6px;
+            border-bottom-right-radius: 6px;
+  }
 }
 // On hover/focus/active, bring the proper btn to front
 .btn-group .btn:hover,