Typography: Eliminated need of a mixin for p

Typography: Eliminated need of mixin for p
jquery-archive · Mar 4, 2016 · 01d2ebe · 01d2ebe
1 parent 14a3d8f
commit 01d2ebe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,3 @@ external/
 icons/svg-min/
 .sass-cache/
 dist/
-.DS_Store
-demos/.DS_Store
diff --git a/scss/atoms/typography/_mixins.scss b/scss/atoms/typography/_mixins.scss
@@ -9,10 +9,3 @@
 	line-height: 1;
 	text-transform: map-get($style,capitalization);
 }
-
-@mixin paragraph($style) {
-	text-align: map-get($style,textAlignment);
-	margin: em(map-get($style,margin)) 0;
-	line-height: 1.5;
-	font-size: em(map-get($style,fontSize));
-}
diff --git a/scss/atoms/typography/_typography.scss b/scss/atoms/typography/_typography.scss
@@ -45,7 +45,10 @@ h6 {
 }
 
 p {
-	@include paragraph($p);
+	text-align: map-get($p,textAlignment);
+	margin: em(map-get($p,margin)) 0;
+	line-height: 1.5;
+	font-size: em(map-get($p,fontSize));
 }
 
 ul, ol {
@@ -57,7 +60,7 @@ ul ul,
 ol ul,
 ul ol,
 ol ol {
-  margin-bottom: 0;
+  	margin-bottom: 0;
 }
 
 /*