Typography: Eliminated need of a mixin for p

thejdeep · thejdeep · commit bdd2f34a2b86 · 2016-03-04T23:40:11.000+05:30
Typography: Eliminated need of mixin for p

Typography: Shorthand margins
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,19 +45,21 @@ h6 {
 }
 
 p {
-	@include paragraph($p);
+	text-align: map-get($p,textAlignment);
+	margin: em(map-get($p,marginTopBottom)) em(map-get($p,marginLeftRight));
+	line-height: 1.5;
+	font-size: em(map-get($p,fontSize));
 }
 
 ul, ol {
-	margin-top: 0;
-	margin-bottom: 10px;
+	margin: 0 0 10px;
 }
 
 ul ul,
 ol ul,
 ul ol,
 ol ol {
-  margin-bottom: 0;
+  	margin: 0;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -45,19 +45,21 @@ h6 {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`p {`
`48`		`- @include paragraph($p);`
	`48`	`+ text-align: map-get($p,textAlignment);`
	`49`	`+ margin: em(map-get($p,marginTopBottom)) em(map-get($p,marginLeftRight));`
	`50`	`+ line-height: 1.5;`
	`51`	`+ font-size: em(map-get($p,fontSize));`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`ul, ol {`
`52`		`- margin-top: 0;`
`53`		`- margin-bottom: 10px;`
	`55`	`+ margin: 0 0 10px;`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`ul ul,`
`57`	`59`	`ol ul,`
`58`	`60`	`ul ol,`
`59`	`61`	`ol ol {`
`60`		`- margin-bottom: 0;`
	`62`	`+ margin: 0;`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`/*`