aboutsummaryrefslogtreecommitdiff
path: root/lib/reset.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-26 15:25:19 -0800
committerMark Otto <[email protected]>2012-01-26 15:25:19 -0800
commit2d67c3408465f44be7336abc6a00af870d2c18f8 (patch)
tree00035c926c09fba04023b55ae3337464b37e3379 /lib/reset.less
parentf398926e4647df1e7e5a2abdbc9e2e9e775eeb34 (diff)
parent721b8a10785c548fa6a1cb26ccd698ceabc43e36 (diff)
downloadbootstrap-2d67c3408465f44be7336abc6a00af870d2c18f8.tar.xz
bootstrap-2d67c3408465f44be7336abc6a00af870d2c18f8.zip
Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment
Conflicts: bootstrap.css bootstrap.min.css
Diffstat (limited to 'lib/reset.less')
-rw-r--r--lib/reset.less3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/reset.less b/lib/reset.less
index 31e7160f2..ef4dc8af6 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -91,8 +91,7 @@ select,
textarea {
margin: 0;
font-size: 100%;
- vertical-align: baseline;
- *vertical-align: middle;
+ vertical-align: middle;
}
button,
input {