Version 1.1.4

_config.yml

@@ -55,7 +55,7 @@ license:
   url:              <%= pkg.licenses[0].url %>
 
 #Project Version
-version: 1.1.3
+version: 1.1.4
 
 
 # =============================================

bower.json

@@ -1,17 +1,20 @@
 {
   "name": "typeplate",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "main": "css/main.css",
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components"
   ],
   "dependencies": {
-    "normalize.scss": "2.1.0"
+    "normalize.scss": "2.1.0",
+    "normalize-css": "~3.0.0",
+    "typeplate": "~1.1.2",
   },
   "devDependencies": {
-    "typeplate": "~1.1.2",
-    "normalize-css": "~3.0.0"
+    "normalize.scss": "2.1.0",
+    "normalize-css": "~3.0.0",
+    "typeplate": "~1.1.4",
   }
 }

humans.txt

@@ -16,7 +16,7 @@
 
 # THANKS
 
-    Trent Walton, Eric Meyer, Tim Brown, Viljamis, Vitaly, Smashing Magazine, Lea Verou & Prism.js, Happy Cog and last, but not least our users. Thank you all for your support.
+    Trent Walton, Eric Meyer, Tim Brown, Viljamis, Vitaly, Smashing Magazine, Lea Verou & Prism.js, Happy Cog and last, but not least our users and contributors. Thank you all for your support.
 
 # TECHNOLOGY COLOPHON
 

index.html

@@ -57,18 +57,19 @@
 		<a href="https://raw.github.com/typeplate/starter-kit/master/css/typeplate.css" data-name="CSS Port" class="dl-item btn">
 			<i class="icon-download"></i>CSS
 			<hr>
-			<small>v1.1.3 | 11kb</small>
+			<small>v1.1.4 | 10kb</small>
 		</a>
+
 		<a href="https://raw.github.com/typeplate/starter-kit/master/scss/typeplate-scss.zip" data-name="Sass Port" class="dl-item btn">
 			<i class="icon-download"></i>Sass
 			<hr>
-			<small>v1.1.3 | 3kb</small>
+			<small>v1.1.4 | 3kb</small>
 		</a>
 
 		<a href="https://github.com/typeplate/starter-kit" data-name="Bower Package" class="dl-item btn">
 			<i class="icon-download"></i>Bower Pkg.
 			<hr>
-			<small>v1.1.3</small>
+			<small>v1.1.4</small>
 		</a>
 	</div>
 </nav>
@@ -244,27 +245,40 @@ <h1 class="gamma section-title"><a class="perma-anchor" href="#base-type">§</a>
 // divide 1 unit of measure by given font-size & return a relative em value
 
 @function measure-margin($scale, $measure, $value) {
-	@return ($measure/$scale)#{$value};
+	$pixelValue: $measure/$scale;
+	$remValue: $pixelValue * $font-base;
+
+	@if $value == rem {
+		@return $pixelValue#{$value};
+	} @else if $value == em {
+		@return ($remValue/$scale)#{$value};
+	} @else {
+		@return $remValue#{$value};
+	}
 }
 
 // $Mixin $Type-Scale
 // -------------------------------------//
 
 @mixin type-scale($scale, $base, $value, $measure:"") {
-
 	@if $value == rem {
 		font-size: $scale#{px};
+		font-size: context-calc($scale, $base, $value);
+	} @else if $value == em {
+		font-size: context-calc($scale, $base, $value);
+	} @else {
+		font-size: $scale#{px};
 	}
 
-	font-size: context-calc($scale, $base, $value);
-
 	@if $measure != "" {
-
 		@if $value == rem {
 			margin-bottom: measure-margin($scale, $measure, $value: px);
+			margin-bottom: measure-margin($scale, $measure, $value);
+		} @else if $value == em {
+			margin-bottom: measure-margin($scale, $measure, $value: em);
+		} @else {
+			margin-bottom: measure-margin($scale, $measure, $value);
 		}
-
-		margin-bottom: measure-margin($scale, $measure, $value);
 	}
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeplate",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Typeplate » A typographic starter kit encouraging great type on the Web",
   "homepage": "http://typeplate.com",
   "repository": {

templates/content/typographic-scale.html

@@ -81,27 +81,40 @@ <h1 class="gamma section-title"><a class="perma-anchor" href="#base-type">§</a>
 // divide 1 unit of measure by given font-size & return a relative em value
 
 @function measure-margin($scale, $measure, $value) {
-	@return ($measure/$scale)#{$value};
+	$pixelValue: $measure/$scale;
+	$remValue: $pixelValue * $font-base;
+
+	@if $value == rem {
+		@return $pixelValue#{$value};
+	} @else if $value == em {
+		@return ($remValue/$scale)#{$value};
+	} @else {
+		@return $remValue#{$value};
+	}
 }
 
 // $Mixin $Type-Scale
 // -------------------------------------//
 
 @mixin type-scale($scale, $base, $value, $measure:"") {
-
 	@if $value == rem {
 		font-size: $scale#{px};
+		font-size: context-calc($scale, $base, $value);
+	} @else if $value == em {
+		font-size: context-calc($scale, $base, $value);
+	} @else {
+		font-size: $scale#{px};
 	}
 
-	font-size: context-calc($scale, $base, $value);
-
 	@if $measure != "" {
-
 		@if $value == rem {
 			margin-bottom: measure-margin($scale, $measure, $value: px);
+			margin-bottom: measure-margin($scale, $measure, $value);
+		} @else if $value == em {
+			margin-bottom: measure-margin($scale, $measure, $value: em);
+		} @else {
+			margin-bottom: measure-margin($scale, $measure, $value);
 		}
-
-		margin-bottom: measure-margin($scale, $measure, $value);
 	}
 }
 

templates/includes/downloads.html

@@ -3,8 +3,9 @@
 		<a href="https://raw.github.com/typeplate/starter-kit/master/css/typeplate.css" data-name="CSS Port" class="dl-item btn">
 			<i class="icon-download"></i>CSS
 			<hr>
-			<small>v{{site.version}} | 11kb</small>
+			<small>v{{site.version}} | 10kb</small>
 		</a>
+
 		<a href="https://raw.github.com/typeplate/starter-kit/master/scss/typeplate-scss.zip" data-name="Sass Port" class="dl-item btn">
 			<i class="icon-download"></i>Sass
 			<hr>