From: Mark Otto <markdotto@gmail.com>
Date: Wed, 15 Apr 2015 22:30:26 +0000 (-0700)
Subject: fix spacer vars
X-Git-Tag: v4.0.0-alpha~311^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=236a86502e641a750674b48c7c91a1f56bd97fb7;p=thirdparty%2Fbootstrap.git

fix spacer vars
---

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 8b12444fd4..592c800d80 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -44,7 +44,7 @@
 .m-b-0 { margin-bottom: 0; }
 .m-l-0 { margin-left:   0; }
 
-.m-a { margin:        $spacer-base; }
+.m-a { margin:        $spacer; }
 .m-t { margin-top:    $spacer-y; }
 .m-r { margin-right:  $spacer-x }
 .m-b { margin-bottom: $spacer-y; }
@@ -92,7 +92,7 @@
 .p-b-0 { padding-bottom: 0; }
 .p-l-0 { padding-left:   0; }
 
-.p-a { padding:        $spacer-base; }
+.p-a { padding:        $spacer; }
 .p-t { padding-top:    $spacer-y; }
 .p-r { padding-right:  $spacer-x }
 .p-b { padding-bottom: $spacer-y; }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 65bd5d029f..0626dbf54e 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -43,6 +43,9 @@ $enable-gradients:           false !default;
 $enable-transitions:         true !default;
 
 $spacer:                     1rem !default;
+$spacer-x:                   $spacer !default;
+$spacer-y:                   $spacer !default;
+
 $border-width:               .075rem !default;
 
 $use-hover-media-query:      false !default;