diff options
| author | Mark Otto <[email protected]> | 2013-08-02 18:48:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-02 18:48:44 -0700 |
| commit | 9435991ff0ffa79c027f12c0a08aa13376c3b2fe (patch) | |
| tree | 8c35e0f80df38a04654b73223e958573be127471 /dist/css/bootstrap.css | |
| parent | 6b850132d056a136dc4734c4d68c9e1c23b7843e (diff) | |
| download | bootstrap-9435991ff0ffa79c027f12c0a08aa13376c3b2fe.tar.xz bootstrap-9435991ff0ffa79c027f12c0a08aa13376c3b2fe.zip | |
move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b)
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a0a8ffaea..8aaf8d451 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1647,6 +1647,62 @@ textarea.input-small { color: #737373; } +.form-inline .form-control, +.form-inline .radio, +.form-inline .checkbox { + display: inline-block; +} + +.form-inline .radio, +.form-inline .checkbox { + margin-top: 0; + margin-bottom: 0; +} + +.form-horizontal .control-label, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { + padding-top: 9px; +} + +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + display: table; + content: " "; +} + +.form-horizontal .form-group:after { + clear: both; +} + +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + display: table; + content: " "; +} + +.form-horizontal .form-group:after { + clear: both; +} + +@media (min-width: 768px) { + .form-horizontal .form-group { + margin-right: -15px; + margin-left: -15px; + } +} + +.form-horizontal .form-group .row { + margin-right: -15px; + margin-left: -15px; +} + +@media (min-width: 768px) { + .form-horizontal .control-label { + text-align: right; + } +} + .btn { display: inline-block; padding: 6px 12px; @@ -2106,62 +2162,6 @@ input[type="button"].btn-block { z-index: 2; } -.form-inline .form-control, -.form-inline .radio, -.form-inline .checkbox { - display: inline-block; -} - -.form-inline .radio, -.form-inline .checkbox { - margin-top: 0; - margin-bottom: 0; -} - -.form-horizontal .control-label, -.form-horizontal .radio-inline, -.form-horizontal .checkbox-inline { - padding-top: 9px; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -@media (min-width: 768px) { - .form-horizontal .form-group { - margin-right: -15px; - margin-left: -15px; - } -} - -.form-horizontal .form-group .row { - margin-right: -15px; - margin-left: -15px; -} - -@media (min-width: 768px) { - .form-horizontal .control-label { - text-align: right; - } -} - .caret { display: inline-block; width: 0; |
