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

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

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index 07677ccb9..6e6647f3b 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -224,7 +224,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
             line-height:2em;
             height:100%;
             text-align:center;    
-            background-color:rgba(0,0,0,0.3);
+            background-color:rgba(0,0,0,0.2);
             display:block;
         }
     }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
index 2c48169a1..1d013ff72 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
@@ -243,6 +243,7 @@
                     line-height:1.9em; /* specific height required as parent 'a' has no height */
                     font-size:1.4rem;
                     width:100%;
+                    background-color:transparent;
                 }
             }
         }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index bd3f9e102..bbb7ea564 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -101,7 +101,7 @@ function InlinePanel(opts) {
         $('#' + deleteInputId + '-button').click(function() {
             /* set 'deleted' form field to true */
             $('#' + deleteInputId).val('1');
-            $('#' + childId).fadeOut(function() {
+            $('#' + childId).slideUp(function() {
                 self.updateMoveButtonDisabledStates();
                 self.setHasContent();
             });