Merge pull request #36 from Brightspace/dbatiste/heading-margins

Adding ability to override margins.
BrightspaceUI · Jan 5, 2016 · b6f91e7 · b6f91e7
2 parents 5d11cd3 + 2d549bd
commit b6f91e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vui-typography",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Mixins and CSS for applying basic typography styles",
   "scripts": {
     "clean": "rimraf *.css",

diff --git a/typography.scss b/typography.scss
@@ -46,51 +46,51 @@
 
 }
 
-@mixin vui-typography-heading1() {
+@mixin vui-typography-heading1($margin: 1.5rem 0 1.5rem 0) {
 
 	color: $vui-color-ferrite;
 	font-family: inherit;
 	font-size: 2rem;
 	font-weight: 300;
 	line-height: 3rem;
 	letter-spacing: px-to-rem(-0.5px, $vui-base-fontSize);
-	margin: 1.5rem 0 1.5rem 0;
+	margin: $margin;
 
 }
 
-@mixin vui-typography-heading2() {
+@mixin vui-typography-heading2($margin: 1.5rem 0 1.5rem 0) {
 
 	color: $vui-color-ferrite;
 	font-family: inherit;
 	font-size: 1.5rem;
 	font-weight: 300;
 	line-height: 2.25rem;
 	letter-spacing: px-to-rem(-0.3px, $vui-base-fontSize);
-	margin: 1.5rem 0 1.5rem 0;
+	margin: $margin;
 
 }
 
-@mixin vui-typography-heading3() {
+@mixin vui-typography-heading3($margin: 1.5rem 0 1.5rem 0) {
 
 	color: $vui-color-ferrite;
 	font-family: inherit;
 	font-size: 1rem;
 	font-weight: 700;
 	line-height: 1.5rem;
 	letter-spacing: px-to-rem(0.5px, $vui-base-fontSize);
-	margin: 1.5rem 0 1.5rem 0;
+	margin: $margin;
 
 }
 
-@mixin vui-typography-heading4() {
+@mixin vui-typography-heading4($margin: 1.5rem 0 1.5rem 0) {
 
 	color: $vui-color-ferrite;
 	font-family: inherit;
 	font-size: 1rem;
 	font-weight: 400;
 	line-height: 1.5rem;
 	letter-spacing: px-to-rem(0.4px, $vui-base-fontSize);
-	margin: 1.5rem 0 1.5rem 0;
+	margin: $margin;
 
 }