From d0c644735b559fd23e7c5d203f4f86b760e8e610 Mon Sep 17 00:00:00 2001
From: Thejdeep Gudivada <tejdeepg@gmail.com>
Date: Thu, 3 Mar 2016 22:15:36 +0530
Subject: [PATCH 1/2] Typography: Added styles for paragraphs and lists

Typography: Eliminated need of a mixin for p

Typography: Eliminated need of mixin for p

Typography: Shorthand margins

Typography: Eliminated need of mixin for p

Typography: Fixed indentation

Typography: Fixed default fontSize

Typography: Changed to follow naming conventions
---
 scss/atoms/typography/_typography.scss | 18 ++++++++++++++++++
 scss/variables/typography.js           | 10 ++++++++++
 2 files changed, 28 insertions(+)

diff --git a/scss/atoms/typography/_typography.scss b/scss/atoms/typography/_typography.scss
index c3d584d..ea9de99 100644
--- a/scss/atoms/typography/_typography.scss
+++ b/scss/atoms/typography/_typography.scss
@@ -44,6 +44,24 @@ h6 {
 	@include heading($h6);
 }
 
+p {
+	text-align: map-get($p,text-alignment);
+	margin: em(map-get($p,margin-top)) em(map-get($p,margin-right)) em(map-get($p,margin-bottom)) em(map-get($p,margin-left));
+	line-height: 1.5;
+	font-size: map-get($font-default, font-size);
+}
+
+ul, ol {
+	margin: 0 0 10px;
+}
+
+ul ul,
+ol ul,
+ul ol,
+ol ol {
+	margin: 0;
+}
+
 /*
 * ==========================================================================
 * Block elements
diff --git a/scss/variables/typography.js b/scss/variables/typography.js
index f0abaf3..2c3c226 100644
--- a/scss/variables/typography.js
+++ b/scss/variables/typography.js
@@ -161,6 +161,16 @@ chassis.typography = {
 			"font-style": "italic",
 			"padding-left": "1em"
 		}
+	},
+	"p": {
+		name: "Paragraph style",
+		value: {
+			"margin-top": "25px",
+			"margin-bottom": "25px",
+			"margin-left": "0px",
+			"margin-right": "0px",
+			"text-alignment": "left"
+		}
 	}
 
 };

From af668645f5a6d04be04f525e5ead83241d8f77c6 Mon Sep 17 00:00:00 2001
From: Thejdeep Gudivada <tejdeepg@gmail.com>
Date: Fri, 11 Mar 2016 09:38:10 +0530
Subject: [PATCH 2/2] Typography: Added font-size to p map

---
 scss/atoms/typography/_typography.scss | 2 +-
 scss/variables/typography.js           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scss/atoms/typography/_typography.scss b/scss/atoms/typography/_typography.scss
index ea9de99..42686eb 100644
--- a/scss/atoms/typography/_typography.scss
+++ b/scss/atoms/typography/_typography.scss
@@ -48,7 +48,7 @@ p {
 	text-align: map-get($p,text-alignment);
 	margin: em(map-get($p,margin-top)) em(map-get($p,margin-right)) em(map-get($p,margin-bottom)) em(map-get($p,margin-left));
 	line-height: 1.5;
-	font-size: map-get($font-default, font-size);
+	font-size: em(map-get($p, font-size));
 }
 
 ul, ol {
diff --git a/scss/variables/typography.js b/scss/variables/typography.js
index 2c3c226..e731a8f 100644
--- a/scss/variables/typography.js
+++ b/scss/variables/typography.js
@@ -169,7 +169,8 @@ chassis.typography = {
 			"margin-bottom": "25px",
 			"margin-left": "0px",
 			"margin-right": "0px",
-			"text-alignment": "left"
+			"text-alignment": "left",
+			"font-size": fontSize
 		}
 	}