Merge branch 'jasny-patch-2' into 2.0.3-wip

Conflicts:
	less/forms.less

1 files changed, 8 insertions, 4 deletions

diff --git a/less/forms.less b/less/forms.less
index d8cb54909..60eff0043 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -397,7 +397,8 @@ select:focus:required:invalid {
   }
   .add-on,
   .btn {
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+    margin-left: -1px;
+    .border-radius(0);
   }
   .active {
     background-color: lighten(@green, 30);
@@ -409,6 +410,10 @@ select:focus:required:invalid {
   .btn {
     margin-right: -1px;
   }
+  .add-on:first-child,
+  .btn:first-child {
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
 }
 .input-append {
   input,
@@ -420,9 +425,8 @@ select:focus:required:invalid {
     border-left-color: #eee;
     border-right-color: #ccc;
   }
-  .add-on,
-  .btn {
-    margin-left: -1px;
+  .add-on:last-child,
+  .btn:last-child {
     .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
   }
 }