diff options
| author | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
| commit | 8ff18a9ffc9171977e58ecb517cad677ba1727b6 (patch) | |
| tree | 4b9149269be92fdc07e373eb5216068ae5df7ce6 /lib/forms.less | |
| parent | b188c0da8b51cd18d6fa3fa958e823a318ba5f10 (diff) | |
| parent | d1b594db7a7307efd7de29a2875046166c69a76f (diff) | |
| download | bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.tar.xz bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.zip | |
fixing conflict and recompiling
Diffstat (limited to 'lib/forms.less')
| -rw-r--r-- | lib/forms.less | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/forms.less b/lib/forms.less index 944d16af6..0da4037df 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -28,6 +28,7 @@ fieldset { // Parent element that clears floats and wraps labels and fields together form .clearfix { margin-bottom: @baseline; + .clearfix() } // Set font for forms @@ -145,7 +146,7 @@ textarea { } input:focus, textarea:focus { - outline: none; + outline: 0; border-color: rgba(82,168,236,.8); @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); .box-shadow(@shadow); @@ -330,12 +331,13 @@ textarea[readonly] { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { - .clearfix(); input { .border-radius(0 3px 3px 0); } .add-on { position: relative; + background: #f5f5f5; + border: 1px solid #ccc; z-index: 2; float: left; display: block; @@ -349,8 +351,6 @@ textarea[readonly] { color: @grayLight; text-align: center; text-shadow: 0 1px 0 @white; - background-color: #f5f5f5; - border: 1px solid #ccc; .border-radius(3px 0 0 3px); } .active { |