rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grunt

Browse source
This commit is contained in:
Mark Otto 2014-11-29 20:58:14 -08:00
parent 7c71b4874b
commit 9c049c99e2
6 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
docs/dist/css/bootstrap.css vendored
View file

@ -2494,7 +2494,21 @@ fieldset[disabled] .checkbox label {
padding-right: 0;
padding-left: 0;
}
.input-sm,
.input-sm {
height: 30px;
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
select.input-sm {
height: 30px;
line-height: 30px;
}
textarea.input-sm,
select[multiple].input-sm {
height: auto;
}
.form-group-sm .form-control {
height: 30px;
padding: 5px 10px;
@ -2502,18 +2516,29 @@ fieldset[disabled] .checkbox label {
line-height: 1.5;
border-radius: 3px;
}
select.input-sm,
select.form-group-sm .form-control {
height: 30px;
line-height: 30px;
}
textarea.input-sm,
textarea.form-group-sm .form-control,
select[multiple].input-sm,
select[multiple].form-group-sm .form-control {
height: auto;
}
.input-lg,
.input-lg {
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px;
}
select.input-lg {
height: 46px;
line-height: 46px;
}
textarea.input-lg,
select[multiple].input-lg {
height: auto;
}
.form-group-lg .form-control {
height: 46px;
padding: 10px 16px;
@ -2521,14 +2546,11 @@ select[multiple].form-group-sm .form-control {
line-height: 1.33;
border-radius: 6px;
}
select.input-lg,
select.form-group-lg .form-control {
height: 46px;
line-height: 46px;
}
textarea.input-lg,
textarea.form-group-lg .form-control,
select[multiple].input-lg,
select[multiple].form-group-lg .form-control {
height: auto;
}