From 5faefd59a57dfa53b7d28d856ceff976a0974239 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 11:12:55 +0000
Subject: [PATCH] Merge commit 'bdd9b8d' into reapply-design-updates-pre-split

---
 .../static/wagtailadmin/css/components/forms.less   |  4 ++++
 .../static/wagtailadmin/css/components/tabs.less    | 13 +++++++++++--
 .../wagtailadmin/css/layouts/page-editor.less       |  4 ++++
 .../static/wagtailadmin/css/panels/rich-text.less   |  3 +--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index 12ec699ac..4ba4af603 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -612,6 +612,10 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
 }
 */
 @media screen and (min-width: @breakpoint-mobile){
+    .fields{
+        max-width:800px;
+    }
+
     input[type=submit], input[type=reset], input[type=button], .button, button{
         font-size:0.95em;
         padding:0.8em 1.4em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
index d92a250ff..8c62523cd 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
@@ -5,7 +5,9 @@
     padding:0;
 
     li{
-        display:inline-block;
+        list-style-type:none;
+        width:48%;
+        float:left;
         border:1px solid @color-grey-4;
         border-width:1px 1px 0px 1px;
         background-color:@color-grey-5;
@@ -24,7 +26,7 @@
         font-size:1.2em;
         text-decoration:none;
         display:block;
-        padding:0 50px;
+        padding:0 20px;
         color:@color-grey-2;
         border-bottom:1px solid transparent;
 
@@ -59,7 +61,14 @@
 
 @media screen and (min-width: @breakpoint-mobile){
     .tab-nav li{
+        float:none;
+        width:auto;
         padding:0;
+        display:inline-block;
+    }
+
+    .tab-nav a{
+        padding:0 50px;
     }
 
     .modal-content .tab-nav li{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
index ea1547aa0..8f672edda 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
@@ -187,6 +187,10 @@
         }
     }
 
+    .fields{
+        max-width:100%;
+    }
+
     /* removes top padding from multiples used within another panel */
     .fields .multiple{
         padding-top:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
index ad827a892..d39c7abca 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
@@ -2,13 +2,12 @@
 
 .hallotoolbar{
     position:absolute;
-    left:5.83%;
+    left:50px;
     z-index:5;
     margin-top:3em;
 }
 .hallotoolbar.affixed{
     position:fixed;
-    left:5.83%;
     margin-left:140px;
     margin-top:0;
 }