diff options
| author | Mark Otto <[email protected]> | 2015-01-15 16:03:13 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-15 16:03:13 -0800 |
| commit | dbffb0b47f573097ec2a0500720accb6aeeab72e (patch) | |
| tree | c0fb1f22db6fa41d17ad603ab3b7d922cc8cc7f1 /dist/css/bootstrap.css | |
| parent | ec2ccf4219bafa18d3a83b5daa70680e73423a51 (diff) | |
| download | bootstrap-dbffb0b47f573097ec2a0500720accb6aeeab72e.tar.xz bootstrap-dbffb0b47f573097ec2a0500720accb6aeeab72e.zip | |
Fixes #15536, #15559: Add .form-group sizing support to .form-control-static
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8dd893ea7..01bdb0804 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2706,6 +2706,12 @@ textarea.form-group-sm .form-control, select[multiple].form-group-sm .form-control { height: auto; } +.form-group-sm .form-control-static { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; +} .input-lg { height: 46px; padding: 10px 16px; @@ -2736,6 +2742,12 @@ textarea.form-group-lg .form-control, select[multiple].form-group-lg .form-control { height: auto; } +.form-group-lg .form-control-static { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; +} .has-feedback { position: relative; } |