Merge pull request #39 from Brightspace/small-text-line-height-override

adding override for line-height to small-text mixin
BrightspaceUI · Jan 12, 2016 · 699e3bf · 699e3bf
2 parents f5dd4ad + 04763da
commit 699e3bf
Show file tree

Hide file tree

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

diff --git a/typography.scss b/typography.scss
@@ -94,13 +94,17 @@
 
 }
 
-@mixin vui-typography-small-text($fontWeight: 400, $margin: 1rem 0 1rem 0) {
+@mixin vui-typography-small-text(
+		$fontWeight: 400,
+		$margin: 1rem 0 1rem 0,
+		$line-height: 1rem
+	) {
 
 	color: $vui-color-ferrite;
 	font-family: inherit;
 	font-size: 0.7rem;
 	font-weight: $fontWeight;
-	line-height: 1rem;
+	line-height: $line-height;
 	letter-spacing: px-to-rem(0.4px, $vui-base-fontSize);
 	margin: $margin;