Merge pull request #27 from dlockhart/unitless-line-height

Unitless line height
BrightspaceUI · Nov 12, 2015 · 2b2a951 · 2b2a951
2 parents c2c756a + e8733b8
commit 2b2a951
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/fonts.scss b/fonts.scss
@@ -1,5 +1,5 @@
 
-@import 'import-once';
+@import 'import-once.scss';
 
 @include import-once('brightspace fonts') {
 	@import url(https://s.brightspace.com/lib/fonts/0.2.0/fonts.css);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vui-typography",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Mixins and CSS for applying basic typography styles",
   "scripts": {
     "clean": "rimraf *.css",

diff --git a/typography.css.scss b/typography.css.scss
@@ -1,4 +1,4 @@
-@import 'typography';
+@import 'typography.scss';
 
 .vui-typography {
 	@include vui-typography;

diff --git a/typography.scss b/typography.scss
@@ -1,7 +1,6 @@
-
-@import 'bower_components/vui-colors/colors';
-@import 'px-to-rem';
-@import 'fonts';
+@import 'bower_components/vui-colors/colors.scss';
+@import 'px-to-rem.scss';
+@import 'fonts.scss';
 
 $vui-base-fontSize: 19px;
 
@@ -21,7 +20,7 @@ $vui-base-fontSize: 19px;
 	font-family: 'Lato', 'Lucida Sans Unicode', 'Lucida Grande', sans-serif;
 	font-size: 1rem;
 	font-weight: 300;
-	line-height: 1.5rem;
+	line-height: 1.5;
 	letter-spacing: px-to-rem(0.3px, $vui-base-fontSize);
 
 	&.vui-dyslexic,