From 4c467799743ee26a4aa22db6fdd7ff1ea732dfdd Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 11:53:27 +0000
Subject: [PATCH] Merge commit '3f4cd0c' into reapply-design-updates-pre-split

---
 .../wagtailadmin/static/wagtailadmin/css/core.less  | 13 +++++++++++--
 .../templates/wagtailadmin/shared/header.html       |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 32e0b4f33..54f1e4f53 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -390,7 +390,8 @@ header{
         float:left;
         margin-right:1em;
         width:50%;
-        &:first-child{
+
+        .hasform &:first-child{
             padding-bottom:0.5em;
             float:none;
         }
@@ -748,7 +749,15 @@ footer, .logo{
                 padding-bottom:0;
                 float:left;
             }
-
+        }
+        .col3{
+            .col3();
+        }
+        .col6{
+            .col6();
+        }
+        .col9{
+            .col9();
         }
     }
     footer{
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
index 293c98454..3039d801a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
@@ -1,6 +1,6 @@
-<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %}">
+<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %} {% if form %}hasform{% endif %}">
     <div class="row row-flush">
-        <div class="left col6">
+        <div class="left col{% if form %}6{% else %}9{% endif %}">
             <h1>{{ title }} <span>{{ subtitle }}</span></h1>
         </div>
         {% if form %}