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

---
 .../wagtailadmin/static/wagtailadmin/css/components/forms.less  | 1 +
 wagtail/wagtailredirects/templates/wagtailredirects/index.html  | 2 +-
 wagtail/wagtailusers/templates/wagtailusers/index.html          | 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 de9a372e4..07677ccb9 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -565,6 +565,7 @@ ul.inline li:first-child, li.inline:first-child{
         }
         .field input{
             padding-left:3em;
+            background-color:white;
         }
         .field:before{
             position:absolute;
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/index.html b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
index a104b3c5a..5dd79d286 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/index.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
@@ -9,7 +9,7 @@
                 <h1>Redirects</h1>
             </div>
             <div class="right col3">
-                <a href="{% url 'wagtailredirects_add_redirect' %}" class="button icon icon-plus-inverse">Add redirect</a>
+                <a href="{% url 'wagtailredirects_add_redirect' %}" class="button bicolor icon icon-plus">Add redirect</a>
             </div>
         </div>
     </header>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/index.html b/wagtail/wagtailusers/templates/wagtailusers/index.html
index 7f0cce2bc..95bdf8ecb 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/index.html
@@ -8,7 +8,7 @@
                 <h1>Users</h1>
             </div>
             <div class="right col3">
-                <a href="{% url 'wagtailusers_create' %}" class="button icon icon-plus-inverse">Add a user</a>
+                <a href="{% url 'wagtailusers_create' %}" class="button bicolor icon icon-plus">Add a user</a>
             </div>
         </div>
     </header>