aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-04-23 00:51:39 -0700
committerMark Otto <[email protected]>2015-04-23 00:51:39 -0700
commitdc3abb5f127b21f677ec663a5c8ccbea45b7168a (patch)
tree59e652727459a71c8d7e7cf031b208f511d6294b /scss
parent56e267e71f6fc22d47e6ab3c6ae2914026ea2524 (diff)
downloadbootstrap-dc3abb5f127b21f677ec663a5c8ccbea45b7168a.tar.xz
bootstrap-dc3abb5f127b21f677ec663a5c8ccbea45b7168a.zip
Update labels and form grid examples
Diffstat (limited to 'scss')
-rw-r--r--scss/_forms.scss19
-rw-r--r--scss/_reboot.scss1
2 files changed, 14 insertions, 6 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 53adccfd4..e5d6e344a 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -3,12 +3,6 @@
// --------------------------------------------------
-// todo: turn this into a class
-label {
- margin-bottom: .5rem;
-}
-
-
//
// Textual form controls
//
@@ -75,6 +69,19 @@ label {
display: block;
}
+
+//
+// Labels
+//
+
+// For use with horizontal and inline forms, when you need the label text to
+// align with the form controls.
+.form-control-label {
+ padding: ($padding-base-vertical + $border-width) $padding-base-horizontal;
+ margin-bottom: 0; // Override the `<label>` default
+}
+
+
// Todo: clear this up
// Special styles for iOS temporal inputs
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 31ce1bc13..dd03174f3 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -232,6 +232,7 @@ th {
label {
// Allow labels can use `margin` for spacing.
display: inline-block;
+ margin-bottom: .5rem;
}
input,