From 045891ee3d463abedad4ef2690b755c0dfdc927f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 11:12:08 +0000
Subject: [PATCH] merging from ui update branch

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

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index 2c08bb257..592773b28 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -227,7 +227,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     }
 
     &.button-small.bicolor{
-        padding-left:3em;
+        padding-left:3.5em;
 
         &:before{
             width:2em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 77ec26233..f92708cbf 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -250,9 +250,9 @@ img{
         /* search form */
         #menu-search{
             position:relative;
+
             .fields{
                 .transition(background-color 0.2s ease);
-                background-color:@color-grey-1;
                 border:0;
                 li{
                     border:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
index c4f80973b..7bae00628 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
@@ -128,7 +128,7 @@
             font-family:Bitter, Georgia, serif;
             .border-radius(0px);
             border:0;
-            padding-top:3em;
+            padding-top:2em;
             padding-bottom:2em;
             font-size:1.2em;
             line-height:1.6em;