From ad6a8682af9853bca937cee8603fa97f082117b1 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 5 Jun 2014 15:25:23 +0100
Subject: [PATCH] removing margins from body, which don't play well with jquery
 position() or offset()

---
 .../static/wagtailadmin/scss/core.scss        |  4 ++--
 .../wagtailadmin/scss/panels/rich-text.scss   | 21 +++++--------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index e622680bd7..80beb7f5f6 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -626,7 +626,7 @@ footer, .logo{
         padding-right:$desktop-nice-padding;
     }
 
-    body{
+    .wrapper{
         margin-left:$menu-width;
     }
 
@@ -645,7 +645,7 @@ footer, .logo{
         left:0;
         height:100%;
         width:$menu-width;
-        margin-left: -$menu-width;
+        margin-left: 0;
 
         .inner{
             height:100%;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
index 8b26f36ab0..c951a0bc58 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
@@ -3,14 +3,13 @@
 
 .hallotoolbar{
     position:absolute;
-    left:50px;
+    left:$mobile-nice-padding;
     z-index:5;
     margin-top:4em;
     margin-left:0em;
 }
 .hallotoolbar.affixed{
     position:fixed;
-    margin-left:140px;
     margin-top:0;
 }
 .hallotoolbar button{
@@ -148,18 +147,8 @@
         }
     }
 }
-
-@media screen and (min-width: $breakpoint-desktop-larger){
-   /* .hallotoolbar{
-        margin:0 auto;
-        position:absolute;
-        left:-$menu-width;
-        right:0;
-        z-index:5;
-        margin-top:3em;
+@media screen and (min-width: $breakpoint-mobile){
+    .hallotoolbar{
+        left:$menu-width + $desktop-nice-padding;
     }
-    .hallotoolbar.affixed{
-        position:fixed;
-        margin:0 auto;
-    }*/
-}
+ }
\ No newline at end of file