root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

grunt dist on prev forms change

This commit is contained in:
Mark Otto 2013-08-13 14:56:58 -07:00
parent 3da3f7e474
commit 8d2948c0d6
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
dist/css/bootstrap.css vendored
View File

@ -1705,23 +1705,6 @@ textarea.form-control {
} }
.input-sm { .input-sm {
height: 45px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px;
}
select.input-sm {
height: 45px;
line-height: 45px;
}
textarea.input-sm {
height: auto;
}
.input-lg {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
@ -1729,11 +1712,28 @@ textarea.input-sm {
border-radius: 3px; border-radius: 3px;
} }
select.input-lg { select.input-sm {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.input-sm {
height: auto;
}
.input-lg {
height: 45px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px;
}
select.input-lg {
height: 45px;
line-height: 45px;
}
textarea.input-lg { textarea.input-lg {
height: auto; height: auto;
} }
@ -2260,18 +2260,18 @@ input[type="button"].btn-block {
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
height: 30px; height: 45px;
padding: 5px 10px; padding: 10px 16px;
font-size: 12px; font-size: 18px;
line-height: 1.5; line-height: 1.33;
border-radius: 3px; border-radius: 6px;
} }
select.input-group-lg > .form-control, select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn { select.input-group-lg > .input-group-btn > .btn {
height: 30px; height: 45px;
line-height: 30px; line-height: 45px;
} }
textarea.input-group-lg > .form-control, textarea.input-group-lg > .form-control,
@ -2283,18 +2283,18 @@ textarea.input-group-lg > .input-group-btn > .btn {
.input-group-sm > .form-control, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon, .input-group-sm > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
height: 45px; height: 30px;
padding: 10px 16px; padding: 5px 10px;
font-size: 18px; font-size: 12px;
line-height: 1.33; line-height: 1.5;
border-radius: 6px; border-radius: 3px;
} }
select.input-group-sm > .form-control, select.input-group-sm > .form-control,
select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn { select.input-group-lg > .input-group-btn > .btn {
height: 45px; height: 30px;
line-height: 45px; line-height: 30px;
} }
textarea.input-group-sm > .form-control, textarea.input-group-sm > .form-control,

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long