Commit 9c049c99 authored by Mark Otto's avatar Mark Otto
Browse files

grunt

parent 7c71b487
Showing with 33 additions and 11 deletions
+33 -11
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2494,7 +2494,21 @@ fieldset[disabled] .checkbox label { ...@@ -2494,7 +2494,21 @@ fieldset[disabled] .checkbox label {
padding-right: 0; padding-right: 0;
padding-left: 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 { .form-group-sm .form-control {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
...@@ -2502,18 +2516,29 @@ fieldset[disabled] .checkbox label { ...@@ -2502,18 +2516,29 @@ fieldset[disabled] .checkbox label {
line-height: 1.5; line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
select.input-sm,
select.form-group-sm .form-control { select.form-group-sm .form-control {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.input-sm,
textarea.form-group-sm .form-control, textarea.form-group-sm .form-control,
select[multiple].input-sm,
select[multiple].form-group-sm .form-control { select[multiple].form-group-sm .form-control {
height: auto; 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 { .form-group-lg .form-control {
height: 46px; height: 46px;
padding: 10px 16px; padding: 10px 16px;
...@@ -2521,14 +2546,11 @@ select[multiple].form-group-sm .form-control { ...@@ -2521,14 +2546,11 @@ select[multiple].form-group-sm .form-control {
line-height: 1.33; line-height: 1.33;
border-radius: 6px; border-radius: 6px;
} }
select.input-lg,
select.form-group-lg .form-control { select.form-group-lg .form-control {
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
textarea.input-lg,
textarea.form-group-lg .form-control, textarea.form-group-lg .form-control,
select[multiple].input-lg,
select[multiple].form-group-lg .form-control { select[multiple].form-group-lg .form-control {
height: auto; height: auto;
} }
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment