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

Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html

6 files changed, 107 insertions, 4 deletions

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index ffad35913..e05a966ad 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -27,13 +27,14 @@
 // Temp catchall for what's missing thus far
 @import "patterns.less";
 
+@import "dropdowns.less";
 @import "tabs-pills.less";
 @import "breadcrumbs.less";
 @import "pagination.less";
 @import "modals.less";
 @import "twipsy.less";
 @import "popovers.less";
-@import "media-grids.less";
+@import "thumbnails.less";
 
 // Responsive
 @import "responsive.less";
\ No newline at end of file
diff --git a/lib/dropdowns.less b/lib/dropdowns.less
new file mode 100644
index 000000000..7436f6a2c
--- /dev/null
+++ b/lib/dropdowns.less
@@ -0,0 +1,94 @@
+// 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;
+  }
+}
diff --git a/lib/forms.less b/lib/forms.less
index a73e6f545..64e77fdb4 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -325,6 +325,7 @@ textarea[readonly] {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
+  overflow: hidden;
   input {
     .border-radius(0 3px 3px 0);
   }
diff --git a/lib/mixins.less b/lib/mixins.less
index 41cf8890d..e8b5cdd2f 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -205,7 +205,6 @@
 
 // Gradient Bar Colors for buttons and alerts
 .gradientBar(@primaryColor, @secondaryColor) {
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   #gradient > .vertical(@primaryColor, @secondaryColor);
   border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
   border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
diff --git a/lib/patterns.less b/lib/patterns.less
index 558f3ca45..44c427adf 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -401,7 +401,7 @@ footer {
   cursor: pointer;
 
   &:hover {
-    color: #333;
+    color: @grayDark;
     text-decoration: none;
     background-position: 0 -15px;
   }
@@ -414,6 +414,7 @@ footer {
   // Primary Button Type
   &.primary {
     color: @white;
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     .gradientBar(@blue, @blueDark)
   }
 
@@ -575,6 +576,12 @@ input[type=submit].btn {
     .box-shadow(0 1px 0 rgba(255,255,255,.25));
   }
 
+  &.error,
+  &.success,
+  &.info {
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  }
+
   &.block-message {
     padding: 14px;
     background-image: none;
diff --git a/lib/media-grids.less b/lib/thumbnails.less
index 12626df3f..9e25f5027 100644
--- a/lib/media-grids.less
+++ b/lib/thumbnails.less
@@ -13,6 +13,7 @@
 }
 .thumbnail {
   display: block;
+  padding: 4px;
   line-height: 1;
   border: 1px solid #ddd;
   .border-radius(4px);
@@ -26,7 +27,7 @@ a.thumbnail:hover {
 // Images and captions
 .thumbnail > img {
   display: block;
-  margin: 4px;
+  max-width: 100%;
 }
 .thumbnail .caption {
   padding: 9px;