typey 1.0.0.alpha.4 → 1.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7f8ea0b630246c8b382021b7588ca9f531b770
-  data.tar.gz: 6a5b849579fa12e7229bc2fbc72b979d6d8c6cad
+  metadata.gz: 05f582671fc72dca0711c61757f16b4d90dd3fa5
+  data.tar.gz: 1c65a7f0073d6c7c30375c4c7cbbf49ab18387a0
 SHA512:
-  metadata.gz: 0d27dc7b6c3e887376630c9621c513fc3313910bd5d7d6c3bc74f62f61d16c74a4f161f4d7ab007bcdfc2d412e8668532d702dba0cb5376229d6d308ca683e79
-  data.tar.gz: 72ddabdb792c0ba37c0893bc543be03cb6ef2c34e528c4da211cfdd019ffa24a1d9a638f9653a57922972b877591ff43fa116e92452379b023e354413bb762b6
+  metadata.gz: 58c36316968c1c9294632bcc62fc9d769bfbc8cc1a070f9fc9868653c33d5b80f58b447ab3dc37c0a748391715546d4e0e90884b96c5ea66ab038d7de083062f
+  data.tar.gz: cb6f5c2ff66819c0afc270afbfcb66286d38a863f367e5e42d0fa84b2839442f80b78f76c876197c0f9968285cb1d952a5fa5f16dc31002a69f3f7e815f3e7e1

data/stylesheets/typey/_defaults.scss

@@ -34,6 +34,26 @@ $font-weight: (
   lighter:                 200
 ) !default;
 
+// Warnings for $base-unit.
+@if $base-unit != px and $base-unit != pt and $base-unit != rem and $base-unit != em {
+  @warn "$base-unit must be one of the following unit types: px, pt, rem, em";
+}
+
+// Warnings for $base-font-size and $base-line-height.
+@if unit($base-font-size) != px and unit($base-font-size) != pt {
+  @warn "$base-font-size must be one of the following unit types: px, pt";
+}
+@if unit($base-line-height) != unit($base-font-size) {
+  @warn "$base-line-height must use the same unit as $base-font-size.";
+}
+
+// Warnings for $font-size
+@each $key, $size in $font-size {
+  @if unit($size) != unit($base-font-size) {
+    @warn "Size '#{$key}' in $font-size map does not match the $base-font-size unit.";
+  }
+}
+
 // Define defaults (in the HTML element).
 //
 // @param number $base-font-size
@@ -50,10 +70,10 @@ $font-weight: (
   @if $base-unit == rem {
     font-size: $base-font-size / $browser-font-size * 100%;
     line-height: $base-line-height;
-    line-height: $base-line-height / $base-font-size + $base-unit;
+    line-height: output-unit($base-line-height / $base-font-size);
   }
   @if $base-unit == em {
     font-size: $base-font-size / $browser-font-size * 100%;
-    line-height: $base-line-height / $base-font-size + $base-unit;
+    line-height: output-unit($base-line-height / $base-font-size);
   }  
 }

data/stylesheets/typey/_font-size.scss

@@ -12,21 +12,36 @@
 //   The selected font-size in $base-unit.
 @function font-size($size, $context: $base-font-size) {
   @if type-of($size) == 'string' {
-    $map-size: map-get($font-size, $size);
-    @if $base-unit == px or $base-unit == pt {
-      @return strip-unit($map-size) + $base-unit;
-    }
-    @if $base-unit == rem {
-      @return ($map-size / $base-font-size) + $base-unit;
-    }
-    @if $base-unit == em {
-      @if type-of($context) == 'string' {
-        $context-map-size: map-get($font-size, $context);
-        @return ($map-size / $context-map-size) + $base-unit;
+    @if map-has-key($font-size, $size) {
+      $map-size: map-get($font-size, $size);
+      @if $base-unit == px or $base-unit == pt {
+        @return output-unit(strip-unit($map-size));
       }
-      @if type-of($context) == 'number' { 
-        @return ($map-size / $context) + $base-unit;
+      @if $base-unit == rem {
+        @return output-unit(($map-size / $base-font-size));
       }
+      @if $base-unit == em {
+        @if type-of($context) == 'string' {
+          @if map-has-key($font-size, $context) {
+            $context-map-size: map-get($font-size, $context);
+            @return output-unit(($map-size / $context-map-size));
+          }
+          @else {
+            @warn "'#{$context}' not found in $font-size map.";
+          }
+        }
+        @if type-of($context) == 'number' {
+          @if unit($context) == unit($base-font-size) {
+            @return output-unit(($map-size / $context));
+          }
+          @else {
+            @warn "The unit used for $context does not match the $base-font-size unit.";
+          }
+        }
+      }
+    }
+    @else {
+      @warn "'#{$size}' not found in $font-size map.";
     }
   }
 }

data/stylesheets/typey/_helpers.scss

@@ -1,3 +1,25 @@
+// Output a number in the $base-unit.
+//
+// @param number $number
+//   The number (without unit) to output.
+//
+// @return number
+//   The number with the base unit
+@function output-unit($number) {
+  @if $base-unit == px {
+    @return $number * 1px;
+  }
+  @if $base-unit == pt {
+    @return $number * 1pt;
+  }
+  @if $base-unit == rem {
+    @return $number * 1rem;
+  }
+  @if $base-unit == em {
+    @return $number * 1em;
+  }
+}
+
 // Remove the unit from a number.
 //
 // @param number $number
@@ -28,20 +50,30 @@
     $unit: unit($number);
     @if $unit == px or $unit == pt {
       @if $base-unit == px or $base-unit == pt {
-        @return strip-unit($number) + $base-unit;
+        @return output-unit(strip-unit($number));
       }
       @if $base-unit == rem {
         @if $unit == unit($base-font-size) { 
-          @return ($number / $base-font-size) + $base-unit;
+          @return output-unit(($number / $base-font-size));
         }
       }
-      @if $base-unit == em {
+      @if $base-unit == em {        
         @if type-of($context) == 'string' {
-          $context-map-size: map-get($font-size, $context);
-          @return ($number / $context-map-size) + $base-unit;
+          @if map-has-key($font-size, $context) {
+            $context-map-size: map-get($font-size, $context);
+            @return output-unit(($number / $context-map-size));
+          }
+          @else {
+            @warn "'#{$context}' not found in $font-size map.";
+          }
         }
-        @if type-of($context) == 'number' { 
-          @return ($number / $context) + $base-unit;
+        @if type-of($context) == 'number' {
+          @if unit($context) == unit($base-font-size) {
+            @return output-unit(($number / $context));
+          }
+          @else {
+            @warn "The unit used for $context does not match the $base-font-size unit.";
+          }
         }
       }
     }

data/stylesheets/typey/_line-height.scss

@@ -19,25 +19,36 @@
 @function line-height($x, $context: $base-font-size) {
   @if type-of($x) == 'number' and unitless($x) {
     @if $base-unit == px or $base-unit == pt {
-      @return strip-unit($x * $base-line-height) + $base-unit;
+      @return output-unit(strip-unit($x * $base-line-height));
     }
     @if $base-unit == rem {
-      @return ($x * $base-line-height) / $base-font-size + $base-unit;
+      @return output-unit(($x * $base-line-height) / $base-font-size);
     }
     @if $base-unit == em {
-      @if type-of($context) == 'string' {
+      @if map-has-key($font-size, $context) {
         $context-map-size: map-get($font-size, $context);
-        @return ($x * $base-line-height) / $context-map-size + $base-unit;
+        @return output-unit(($x * $base-line-height) / $context-map-size);
       }
-      @if type-of($context) == 'number' { 
-        @return ($x * $base-line-height) / $context + $base-unit;
+      @else {
+        @warn "'#{$context}' not found in $font-size map.";
+      }
+      @if type-of($context) == 'number' {
+        @if unit($context) == unit($base-font-size) {
+        @return output-unit(($x * $base-line-height) / $context);
+        }
+        @else {
+          @warn "The unit used for $context does not match the $base-font-size unit.";
+        }
       }
     }
   }
   @if type-of($x) == 'number' and not unitless($x) {
-    @if unit($x) == px or unit($x) == pt {
+    @if unit($x) == unit($base-font-size) {
       @return convert-unit($x, $context);
     }
+    @else {
+      @warn "line-height() accepts only numbers or values with the same unit as $base-font-size.";
+    }
   }
 }
 

data/typey.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.homepage     = 'http://github.com/jptaranto/typey'
   spec.rubyforge_project =
 
-  spec.version      = '1.0.0.alpha.4'
+  spec.version      = '1.0.0.alpha.5'
   spec.date         = '2015-04-22'
   spec.licenses     = ['GPL-2']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typey
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.4
+  version: 1.0.0.alpha.5
 platform: ruby
 authors:
 - Jack Taranto
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 1.0.0.alpha.4
+rubyforge_project: 1.0.0.alpha.5
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4