From ac4420237c166538e34768b7cdc64a38470ad493 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Aug 2012 20:32:47 -0700 Subject: [PATCH] fixes #4591 properly: remove -1px left margin on .input-append .add-on --- docs/assets/css/bootstrap.css | 6 +++++- less/forms.less | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 53eae469ae..483a13fad4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1512,7 +1512,6 @@ select:focus:required:invalid:focus { .input-prepend .add-on, .input-append .btn, .input-prepend .btn { - margin-left: -1px; vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -1545,6 +1544,11 @@ select:focus:required:invalid:focus { border-radius: 3px 0 0 3px; } +.input-append .add-on, +.input-append .btn { + margin-left: -1px; +} + .input-append .add-on:last-child, .input-append .btn:last-child { -webkit-border-radius: 0 3px 3px 0; diff --git a/less/forms.less b/less/forms.less index c766f5d9c2..36f37496be 100644 --- a/less/forms.less +++ b/less/forms.less @@ -441,7 +441,6 @@ select:focus:required:invalid { } .add-on, .btn { - margin-left: -1px; vertical-align: top; .border-radius(0); } @@ -466,6 +465,10 @@ select:focus:required:invalid { .uneditable-input { .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); } + .add-on, + .btn { + margin-left: -1px; + } .add-on:last-child, .btn:last-child { .border-radius(0 @inputBorderRadius @inputBorderRadius 0);