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

Conflicts:
	bootstrap.css

4 files changed, 13 insertions, 12 deletions

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 57ada98a9..d71002c46 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -39,7 +39,7 @@
 
 // Components: Popovers
 @import "modals.less";
-@import "twipsy.less";
+@import "tooltip.less";
 @import "popovers.less";
 
 // Components: Buttons & Alerts
diff --git a/lib/button-groups.less b/lib/button-groups.less
index d2307018e..e9724ba8c 100644
--- a/lib/button-groups.less
+++ b/lib/button-groups.less
@@ -90,6 +90,7 @@
   display: block;
   top: 30px;
   .border-radius(5px);
+  &.large { top: 40px; }
 }
 .btn-group.open .dropdown-toggle {
   background-image: none;
diff --git a/lib/twipsy.less b/lib/tooltip.less
index 7eaa7d5bf..b21c6bb7a 100644
--- a/lib/twipsy.less
+++ b/lib/tooltip.less
@@ -1,9 +1,9 @@
-// TWIPSY
-// ------
+// TOOLTIP
+// ------=
 
-.twipsy {
+.tooltip {
   position: absolute;
-  z-index: @zindexTwipsy;
+  z-index: @zindexTooltip;
   display: block;
   visibility: visible;
   padding: 5px;
@@ -14,12 +14,12 @@
   &.right  { margin-left:  2px; }
   &.bottom { margin-top:   2px; }
   &.left   { margin-left: -2px; }
-  &.top .twipsy-arrow    { #popoverArrow > .top(); }
-  &.left .twipsy-arrow   { #popoverArrow > .left(); }
-  &.bottom .twipsy-arrow { #popoverArrow > .bottom(); }
-  &.right .twipsy-arrow  { #popoverArrow > .right(); }
+  &.top .tooltip-arrow    { #popoverArrow > .top(); }
+  &.left .tooltip-arrow   { #popoverArrow > .left(); }
+  &.bottom .tooltip-arrow { #popoverArrow > .bottom(); }
+  &.right .tooltip-arrow  { #popoverArrow > .right(); }
 }
-.twipsy-inner {
+.tooltip-inner {
   max-width: 200px;
   padding: 3px 8px;
   color: white;
@@ -28,7 +28,7 @@
   background-color: @black;
   .border-radius(4px);
 }
-.twipsy-arrow {
+.tooltip-arrow {
   position: absolute;
   width: 0;
   height: 0;
diff --git a/lib/variables.less b/lib/variables.less
index 97b6f9e3c..3f32c36f4 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -52,7 +52,7 @@
 
 @zindexDropdown:        1000;
 @zindexPopover:         1010;
-@zindexTwipsy:          1020;
+@zindexTooltip:         1020;
 @zindexFixedNavbar:     1030;
 @zindexModalBackdrop:   1040;
 @zindexModal:           1050;