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

Conflicts:
	bootstrap.css

3 files changed, 53 insertions, 1 deletions

diff --git a/lib/mixins.less b/lib/mixins.less
index 83a3a31f9..32d3a83ac 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -60,7 +60,7 @@
       font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     }
     .monospace() {
-      font-family: Menlo, Monaco, Courier New, monospace;
+      font-family: Menlo, Monaco, "Courier New", monospace;
     }
   }
   .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
diff --git a/lib/modals.less b/lib/modals.less
index 4d2b92cbc..96f9a488e 100644
--- a/lib/modals.less
+++ b/lib/modals.less
@@ -23,6 +23,8 @@
   top: 50%;
   left: 50%;
   z-index: 11000;
+  max-height: 500px;
+  overflow: auto;
   width: 560px;
   margin: -250px 0 0 -250px;
   background-color: @white;
diff --git a/lib/thumbnails.less b/lib/thumbnails.less
index 9e25f5027..6ac3cb51f 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -32,3 +32,53 @@ a.thumbnail:hover {
 .thumbnail .caption {
   padding: 9px;
 }
+
+.carousel {
+
+  position: relative;
+
+  .carousel-inner {
+    overflow: hidden;
+    width: 100%;
+    position: relative;
+  }
+
+  .item {
+    display: none;
+    position: relative;
+    .transition(.6s ease-in-out left);
+  }
+
+  .active, .next, .prev { display: block; }
+
+  .next, .prev {
+    position: absolute;
+    top: 0;
+    width: 100%;
+  }
+
+  .next { left: 100%; }
+  .prev { left: -100%; }
+  .next.left, .prev.right { left: 0% }
+
+  .active.left { left: -100% }
+  .active.right { left: 100% }
+
+  .nav {
+    width: auto;
+    .border-radius(0);
+    height: 50px;
+    position: absolute;
+    top: 50%;
+    margin: -25px 0 0;
+    cursor: pointer;
+    background: rgba(0, 0, 0, 0.7);
+    color: white;
+    font-size: 42px;
+    left: 5px;
+    font-weight: 100;
+    padding: 0 15px;
+    &.right { right: 5px; left: auto; }
+    &:hover { text-decoration: none; background: rgba(0, 0, 0, 0.8); }
+  }
+}
\ No newline at end of file