diff options
| author | Mark Otto <[email protected]> | 2011-06-28 14:30:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-06-28 14:30:48 -0700 |
| commit | 01c5e74bb3a351feb0c83ff14fb22244647eb82b (patch) | |
| tree | 1d72cf2f382060bc552151dbfe2df1b2647f0d73 /lib/forms.less | |
| parent | 5949b8e14559464539541ee02f6af4fc2cfe1cbf (diff) | |
| parent | e91a74e8e89240d061478326ad26bd4ffa9ce910 (diff) | |
| download | bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.tar.xz bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.zip | |
resolve conflict
Diffstat (limited to 'lib/forms.less')
| -rw-r--r-- | lib/forms.less | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/forms.less b/lib/forms.less index 5a705b9fb..876f62123 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -1,7 +1,7 @@ /* - Forms - Baseline styles for various input types, form layouts, and states -*/ + * Forms.less + * Base line styles for various input types, form layouts, and states + */ /* Global form styles @@ -79,14 +79,14 @@ form { .box-shadow(inset 0 1px 2px rgba(0,0,0,.075)); } // Focus states - input[type=text], - input[type=password], + input[type=text], + input[type=password], select, textarea { @transition: border linear .2s, box-shadow linear .2s; .transition(@transition); } - input[type=text]:focus, - input[type=password]:focus, + input[type=text]:focus, + input[type=password]:focus, textarea:focus { outline: none; border-color: rgba(82,168,236,.75); @@ -102,8 +102,8 @@ form { > label { color: @red; } - input[type=text], - input[type=password], + input[type=text], + input[type=password], textarea { border-color: @error-text; .box-shadow(0 0 3px rgba(171,41,32,.25)); @@ -304,7 +304,7 @@ ul.inputs-list { form.form-stacked { fieldset { padding-top: @baseline / 2; - } + } legend { margin-left: 0; } |