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

Conflicts:
	bootstrap.css
	docs/javascript.html

1 files changed, 25 insertions, 1 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 3fa776fcb..354f534b2 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 18:20:33 CST 2011
+ * Date: Wed Dec 21 18:38:56 CST 2011
  */
 html, body {
   margin: 0;
@@ -2466,6 +2466,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-opacity: 0.8;
   opacity: 0.8;
 }
+.twipsy.above {
+  margin-top: -2px;
+}
+.twipsy.right {
+  margin-left: 2px;
+}
+.twipsy.below {
+  margin-top: 2px;
+}
+.twipsy.left {
+  margin-left: -2px;
+}
 .twipsy.above .twipsy-arrow {
   bottom: 0;
   left: 50%;
@@ -2522,6 +2534,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   display: none;
   padding: 5px;
 }
+.popover.above {
+  margin-top: -5px;
+}
+.popover.right {
+  margin-left: 5px;
+}
+.popover.below {
+  margin-top: 5px;
+}
+.popover.left {
+  margin-left: -5px;
+}
 .popover.above .arrow {
   bottom: 0;
   left: 50%;