diff options
| author | Jacob Thornton <[email protected]> | 2011-09-11 21:04:01 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-11 21:04:01 -0700 |
| commit | f8aaec5260a0a3bfe11c8f54b79ed0924a6c278b (patch) | |
| tree | 8bd6276872658feb9d5723433ba4b495d2e68fae /lib | |
| parent | 200f5817ba7eb4c9ccafed3faad45b06ba89dfa7 (diff) | |
| parent | af2223efb1048c9b9dd53f7f2481646d731d0da7 (diff) | |
| download | bootstrap-f8aaec5260a0a3bfe11c8f54b79ed0924a6c278b.tar.xz bootstrap-f8aaec5260a0a3bfe11c8f54b79ed0924a6c278b.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/forms.less | 14 | ||||
| -rw-r--r-- | lib/patterns.less | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/forms.less b/lib/forms.less index c86751193..5b19129f8 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -327,20 +327,22 @@ textarea[readonly] { .border-radius(0 3px 3px 0); } .add-on { - background: #f5f5f5; + position: relative; + z-index: 2; float: left; display: block; width: auto; min-width: 16px; + height: 18px; padding: 4px 4px 4px 5px; - color: @grayLight; + margin-right: -1px; font-weight: normal; line-height: 18px; - height: 18px; + color: @grayLight; text-align: center; text-shadow: 0 1px 0 #fff; + background-color: #f5f5f5; border: 1px solid #ccc; - border-right-width: 0; .border-radius(3px 0 0 3px); } .active { @@ -360,8 +362,8 @@ textarea[readonly] { } .add-on { .border-radius(0 3px 3px 0); - border-right-width: 1px; - border-left-width: 0; + margin-right: 0; + margin-left: -1px; } } diff --git a/lib/patterns.less b/lib/patterns.less index 88f56ea59..e2ef83ce2 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -161,6 +161,7 @@ .menu-dropdown, .dropdown-menu { right: 0; + border: 0; } } // Dropdowns within the .nav |