aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-02 18:48:44 -0700
committerMark Otto <[email protected]>2013-08-02 18:48:44 -0700
commit9435991ff0ffa79c027f12c0a08aa13376c3b2fe (patch)
tree8c35e0f80df38a04654b73223e958573be127471 /less
parent6b850132d056a136dc4734c4d68c9e1c23b7843e (diff)
downloadbootstrap-9435991ff0ffa79c027f12c0a08aa13376c3b2fe.tar.xz
bootstrap-9435991ff0ffa79c027f12c0a08aa13376c3b2fe.zip
move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b)
Diffstat (limited to 'less')
-rw-r--r--less/forms.less44
-rw-r--r--less/input-groups.less41
2 files changed, 44 insertions, 41 deletions
diff --git a/less/forms.less b/less/forms.less
index 494d328c0..41d50a5e0 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -280,3 +280,47 @@ textarea {
margin-bottom: 10px;
color: lighten(@text-color, 25%); // lighten the text some for contrast
}
+
+
+
+// Inline forms
+//
+// Make forms appear inline(-block).
+
+.form-inline {
+ .form-control,
+ .radio,
+ .checkbox {
+ display: inline-block;
+ }
+ .radio,
+ .checkbox {
+ margin-top: 0;
+ margin-bottom: 0;
+ }
+}
+
+
+// Horizontal forms
+//
+// Horizontal forms are built on grid classes and allow you to create forms with
+// labels on the left and inputs on the right.
+
+.form-horizontal .control-label,
+.form-horizontal .radio-inline,
+.form-horizontal .checkbox-inline {
+ padding-top: 9px;
+}
+
+.form-horizontal {
+ .form-group {
+ .make-row();
+ }
+}
+
+// Only right align form labels here when the columns stop stacking
+@media (min-width: @screen-tablet) {
+ .form-horizontal .control-label {
+ text-align: right;
+ }
+}
diff --git a/less/input-groups.less b/less/input-groups.less
index 3586beef7..1a6368831 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -113,44 +113,3 @@
z-index: 2;
}
}
-
-
-// Inline forms
-// --------------------------------------------------
-
-.form-inline {
- .form-control,
- .radio,
- .checkbox {
- display: inline-block;
- }
- .radio,
- .checkbox {
- margin-top: 0;
- margin-bottom: 0;
- }
-}
-
-
-// Horizontal forms
-// --------------------------------------------------
-// Horizontal forms are built on grid classes.
-
-.form-horizontal .control-label,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
- padding-top: 9px;
-}
-
-.form-horizontal {
- .form-group {
- .make-row();
- }
-}
-
-// Only right align form labels here when the columns stop stacking
-@media (min-width: @screen-tablet) {
- .form-horizontal .control-label {
- text-align: right;
- }
-}