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

---
 .../wagtailadmin/static/wagtailadmin/css/components/forms.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index 01990b1f6..c98a47f30 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -144,8 +144,8 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     .border-radius(3px);
     width:auto;
     padding:0.7em 1em;
-    border:none;
     background-color: @color-button;
+    border:1px solid @color-button;
     color:white;
     text-decoration:none;
     text-transform:uppercase;
@@ -214,6 +214,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     }  
 
     &.bicolor{
+        border:0;
         padding-left:3.5em;
 
         &:before{