aboutsummaryrefslogtreecommitdiff
path: root/less/forms.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-08-14 21:06:39 -0700
committerJacob Thornton <[email protected]>2012-08-14 21:06:39 -0700
commitae9a2bd93a8863eca8346f19a29d55f6c726a156 (patch)
tree7e158118727accf105ffda746a280db35d31c2a6 /less/forms.less
parentdee57462e2805421a0fe0d786229446bbaef677b (diff)
parente1659b2c4ebcd1124665779fe045600207ea7333 (diff)
downloadbootstrap-ae9a2bd93a8863eca8346f19a29d55f6c726a156.tar.xz
bootstrap-ae9a2bd93a8863eca8346f19a29d55f6c726a156.zip
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'less/forms.less')
-rw-r--r--less/forms.less7
1 files changed, 4 insertions, 3 deletions
diff --git a/less/forms.less b/less/forms.less
index 0b3f10cb0..02ea7a518 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -132,8 +132,9 @@ input[type="color"],
// Position radios and checkboxes better
input[type="radio"],
input[type="checkbox"] {
- margin: 4px 0;
+ margin: 4px 0 0;
*margin-top: 0; /* IE7 */
+ margin-top: 1px \9; /* IE8-9 */
line-height: normal;
cursor: pointer;
}
@@ -151,9 +152,9 @@ input[type="checkbox"] {
// Set the height of select and file controls to match text inputs
select,
input[type="file"] {
- height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+ height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
- line-height: 28px;
+ line-height: 30px;
}
// Make select elements obey height by applying a border