aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-26 15:51:25 -0700
committerMark Otto <[email protected]>2013-07-26 15:51:25 -0700
commit01c6617f79b72c72ef9dfe5085638e69ec80f090 (patch)
tree5c0ae7f6f16b50c329d9942595eb57adf778b589 /dist/css/bootstrap.css
parent68827689e877aca14197a1e889531dcc2130ce18 (diff)
downloadbootstrap-01c6617f79b72c72ef9dfe5085638e69ec80f090.tar.xz
bootstrap-01c6617f79b72c72ef9dfe5085638e69ec80f090.zip
Update inline and horizontal forms
* No more need for `.row.form-group`--only need `.form-group` * Change tag selectors for inline form to use `.form-control` * Docs improved to explain what's happening
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css40
1 files changed, 34 insertions, 6 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 9aff040ac..79ea5445a 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1640,9 +1640,7 @@ select.input-small {
z-index: 2;
}
-.form-inline input,
-.form-inline select,
-.form-inline textarea,
+.form-inline .form-control,
.form-inline .radio,
.form-inline .checkbox {
display: inline-block;
@@ -1658,6 +1656,38 @@ select.input-small {
padding-top: 6px;
}
+.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;
@@ -2748,9 +2778,7 @@ button.close {
margin-bottom: 6px;
}
-.navbar-form input,
-.navbar-form select,
-.navbar-form textarea,
+.navbar-form .form-control,
.navbar-form .radio,
.navbar-form .checkbox {
display: inline-block;