From: Mark Otto <markotto@twitter.com>
Date: Sat, 7 Apr 2012 23:43:48 +0000 (-0700)
Subject: Merge branch 'jasny-patch-2' into 2.0.3-wip
X-Git-Tag: v2.0.3~5^2~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d30225e2c194e50840e002c085a998d3f3a33dc;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	less/forms.less
---

1d30225e2c194e50840e002c085a998d3f3a33dc
diff --cc less/forms.less
index d8cb549092,1da8d7500f..60eff00438
--- a/less/forms.less
+++ b/less/forms.less
@@@ -397,7 -391,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 -403,10 +410,10 @@@
    .btn {
      margin-right: -1px;
    }
+   .add-on:first-child,
+   .btn:first-child {
 -    .border-radius(3px 0 0 3px);
++    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+   }
  }
  .input-append {
    input,
@@@ -420,10 -418,13 +425,9 @@@
      border-left-color: #eee;
      border-right-color: #ccc;
    }
--  .add-on,
--  .btn {
--    margin-left: -1px;
 -  }
+   .add-on:last-child,
+   .btn:last-child {
 -    .border-radius(0 3px 3px 0);
 +    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
    }
  }
  // Remove all border-radius for inputs with both prepend and append