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

---
 .../static/wagtailadmin/css/components/listing.less        | 2 +-
 wagtail/wagtailadmin/static/wagtailadmin/css/core.less     | 2 +-
 .../static/wagtailadmin/css/layouts/page-editor.less       | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less
index b2ebfa36c..850dba147 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less
@@ -360,7 +360,7 @@ ul.listing{
             border-width:0 0 0 1px !important;
 
             > li{
-                padding:@grid-gutter-width/2;
+                padding:1.3em;
                 width:200px;
                 height:220px;
                 text-align:center;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 1e6117cd9..7fada0171 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -742,7 +742,7 @@ footer, .logo{
 @media screen and (min-width: @breakpoint-desktop-larger){
     body{
         margin:0;
-        background:#555;
+        background:#DDD;
     }   
     .wrapper{
         background-color:@color-grey-5;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
index 1d013ff72..817f4156a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
@@ -152,7 +152,8 @@
 
         .error,
         .error input,
-        .error textarea{
+        .error textarea,
+        .error .richtext{
             background-color:@color-input-error-bg;
         }
     }
@@ -164,6 +165,10 @@
         font-size:2em;
         padding-top:2em;
     }
+    &.title input{
+        padding-top:1.5em;
+        padding-bottom:1.5em;
+    }
 
     .multiple{
         .transition(max-height 10s ease);