aboutsummaryrefslogtreecommitdiff
path: root/scss/_forms.scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-06-22 18:57:56 -0700
committerMark Otto <[email protected]>2015-06-22 18:57:56 -0700
commit75cf69a1ab9bf36147ab237c937b46751b981200 (patch)
treecf6a7eb829f814f896453fd213e114f2d554733b /scss/_forms.scss
parent0ca9b21c348800fdffd77271af645f79b4bdbd24 (diff)
downloadbootstrap-75cf69a1ab9bf36147ab237c937b46751b981200.tar.xz
bootstrap-75cf69a1ab9bf36147ab237c937b46751b981200.zip
drop more -base, clean up var spacing
Diffstat (limited to 'scss/_forms.scss')
-rw-r--r--scss/_forms.scss8
1 files changed, 4 insertions, 4 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 6f7d7f962..1632c3898 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -12,7 +12,7 @@
width: 100%;
// // Make inputs at least the height of their button counterpart (base line-height + padding + border)
// height: $input-height;
- padding: $padding-base-y $padding-base-x;
+ padding: $padding-y $padding-x;
font-size: $font-size-base;
line-height: $line-height-base;
color: $input-color;
@@ -83,7 +83,7 @@
// 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-y + $border-width) $padding-base-x;
+ padding: ($padding-y + $border-width) $padding-x;
margin-bottom: 0; // Override the `<label>` default
}
@@ -127,8 +127,8 @@
.form-control-static {
min-height: $input-height;
// Size it appropriately next to real form controls
- padding-top: ($padding-base-y + $border-width);
- padding-bottom: ($padding-base-y + $border-width);
+ padding-top: ($padding-y + $border-width);
+ padding-bottom: ($padding-y + $border-width);
// Remove default margin from `p`
margin-bottom: 0;