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

Conflicts:
	bootstrap.css

1 files changed, 9 insertions, 9 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 2ea7a8fbe..5e22415dd 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Dec 21 19:31:39 CST 2011
+ * Date: Mon Dec 26 16:47:02 CST 2011
  */
 html, body {
   margin: 0;
@@ -2451,19 +2451,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-opacity: 0.8;
   opacity: 0.8;
 }
-.twipsy.above {
+.twipsy.top {
   margin-top: -2px;
 }
 .twipsy.right {
   margin-left: 2px;
 }
-.twipsy.below {
+.twipsy.bottom {
   margin-top: 2px;
 }
 .twipsy.left {
   margin-left: -2px;
 }
-.twipsy.above .twipsy-arrow {
+.twipsy.top .twipsy-arrow {
   bottom: 0;
   left: 50%;
   margin-left: -5px;
@@ -2479,7 +2479,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   border-bottom: 5px solid transparent;
   border-left: 5px solid #000000;
 }
-.twipsy.below .twipsy-arrow {
+.twipsy.bottom .twipsy-arrow {
   top: 0;
   left: 50%;
   margin-left: -5px;
@@ -2519,19 +2519,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   display: none;
   padding: 5px;
 }
-.popover.above {
+.popover.top {
   margin-top: -5px;
 }
 .popover.right {
   margin-left: 5px;
 }
-.popover.below {
+.popover.bottom {
   margin-top: 5px;
 }
 .popover.left {
   margin-left: -5px;
 }
-.popover.above .arrow {
+.popover.top .arrow {
   bottom: 0;
   left: 50%;
   margin-left: -5px;
@@ -2547,7 +2547,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   border-bottom: 5px solid transparent;
   border-right: 5px solid #000000;
 }
-.popover.below .arrow {
+.popover.bottom .arrow {
   top: 0;
   left: 50%;
   margin-left: -5px;