typey 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1c139e99533ba0abdfb4d0dd7655b83ae682ba
-  data.tar.gz: b6bef027eae10d375ba0b52845d36c0ad7500af3
+  metadata.gz: e348cf7ae35571ee211401f450885e3734c4a0fb
+  data.tar.gz: 282ccd59ceb3c1cfc78082d8ca2b1184ff9f4ff3
 SHA512:
-  metadata.gz: 0a60614ec5ebbf26ce47ef905cd118b421d0facf37d2a1b9f1d7033ed78022cf6c5434ae37c74a0a05c6e47fbf7150198db5d13a13d8c217a9c58230adf00dad
-  data.tar.gz: 8f6af191adc9f9cc474a816fe7169e6f342dd82baa36f2e4ed40cd9d18c24d19270be67a7aad2c83e8cf400b1bf2a3bf78a41d7628e999f242286e597ba57d0d
+  metadata.gz: baa3aa85f77a74a1a2a5f5b472bd0c90394497bdf93ab77c0a9ef9525e92f4992839cc9dc584da3033fbff807cdfbec7f39bc40ffacd8a6df30e7d9fa87357ba
+  data.tar.gz: 63e08afe02d48031f8859953ce2d5eff261dcbcf5140e649b98e8b43bd117d6a4ba2638ec87cfb8d1cf4f1cd48aca850d04526e3aa0ea329100ac19e8b7e6df0

data/README.md

@@ -19,11 +19,6 @@ RubyGems & Compass
 * config.rb: `require 'typey'`
 * SCSS: `@import 'typey'`
 
-Bower
-
-* Terminal: `bower install typey --save`
-* SCSS: `@import 'bower_components/typey/typey'`
-
 ## Getting started
 
 ### How do I tell typey what to do?
@@ -138,6 +133,7 @@ $typefaces: (
     font-family: $monaco,
     letter-spacing: .5px,
     weight: bold,
+    style: normal,
     case: uppercase,
   )
 );
@@ -153,7 +149,7 @@ typeface has been.
 
 ```sass
 h1, h2, h3 {
-  @include typeface(helvetica);
+  @include typeface(sans-serif);
 }
 ```
 
@@ -168,7 +164,9 @@ $typestyles: (
     font-size: xl,
     line-height: 1.25,
     weight: bold,
-    case: uppercase  
+    style: italic,
+    case: uppercase,
+    letter-spacing: -2px  
   ),
   heading-2: (
     font-size: l,

data/stylesheets/_typey.scss

@@ -1,3 +1,4 @@
+/*! typey | GPLv2 License | https://github.com/jptaranto/typey */
 @import "typey/functions/helpers";
 @import "typey/functions/validators";
 @import "typey/functions/em-calculators";

data/stylesheets/typey/_defaults.scss

@@ -111,6 +111,20 @@ $typey-debug:              false !default;
 // Debug grid coloring
 $typey-debug-color:        #4affff !default;
 
+// Lets store the allowed values for text-transform and font-style so we can
+// make shorthand work a little better.
+$text-transform-values: (
+  lowercase,
+  uppercase,
+  capitalize
+) !default;
+
+$font-style-values: (
+  normal,
+  italic,
+  oblique
+) !default;
+
 // Warnings for $base-unit.
 @if $base-unit != px and $base-unit != rem and $base-unit != em {
   @error "$base-unit must be one of the following unit types: rem, em or px";

data/stylesheets/typey/mixins/_typeface.scss

@@ -9,6 +9,7 @@
   $font-family: false;
   $letter-spacing: false;
   $weight: false;
+  $style: false;
   $case: false;
 
   // Assign values to variables when $typeface is a keyed map.
@@ -22,6 +23,9 @@
     @if map-has-key($typeface, weight) {
       $weight: map-get($typeface, weight);
     }
+    @if map-has-key($typeface, style) {
+      $style: map-get($typeface, style);
+    }
     @if map-has-key($typeface, case) {
       $case: map-get($typeface, case);
     }
@@ -48,9 +52,13 @@
           $weight: $value;
         }
         // This is a case value.
-        @if type-of($value) == "string" and not(map-has-key($font-weight, $value)) {
+        @else if type-of($value) == "string" and index($text-transform-values, $value) != null {
           $case: $value;
         }
+        // This is a style value.
+        @else if type-of($value) == "string" and index($font-style-values, $value) != null {
+          $style: $value;
+        }
       }
     }
   }
@@ -73,6 +81,9 @@
   @if $weight {
     font-weight: weight($weight);
   }
+  @if $style {
+    font-style: $style;
+  }
   @if $case {
     text-transform: $case;
   }

data/stylesheets/typey/mixins/_typeset.scss

@@ -12,7 +12,9 @@
   $font-size: false;
   $line-height: false;
   $weight: false;
+  $style: false;
   $case: false;
+  $letter-spacing: false;
 
   // Assign values to variables when $typestyle is a keyed map.
   @if type-of($typestyle) == "map" {
@@ -25,9 +27,15 @@
     @if map-has-key($typestyle, weight) {
       $weight: map-get($typestyle, weight);
     }
+    @if map-has-key($typestyle, style) {
+      $style: map-get($typestyle, style);
+    }
     @if map-has-key($typestyle, case) {
       $case: map-get($typestyle, case);
     }
+    @if map-has-key($typestyle, letter-spacing) {
+      $letter-spacing: map-get($typestyle, letter-spacing);
+    }
   }
 
   // Assign values to variables when $typestyle is shorthand.
@@ -38,7 +46,7 @@
         $font-size: $value;
       }
       // This is a line-height value.
-      @else if type-of($value) == "number" and not(index($typestyle, $value) == 1) {
+      @else if type-of($value) == "number" and index($typestyle, $value) == 2 {
         $line-height: $value;
       }
       // This is a font-weight value.
@@ -46,9 +54,17 @@
         $weight: $value;
       }
       // This is a case value.
-      @else if type-of($value) == "string" and not(index($typestyle, $value) == 1) {
+      @else if type-of($value) == "string" and index($text-transform-values, $value) != null {
         $case: $value;
       }
+      // This is a style value.
+      @else if type-of($value) == "string" and index($font-style-values, $value) != null {
+        $style: $value;
+      }
+      // This is a letter-spacing value.
+      @else if type-of($value) == "number" and index($typestyle, $value) != 2 and index($typestyle, $value) != 1 {
+        $letter-spacing: $value;
+      }
     }
   }
 
@@ -72,7 +88,13 @@
   @if $weight {
     font-weight: weight($weight);
   }
+  @if $style {
+    font-style: $style;
+  }
   @if $case {
     text-transform: $case;
   }
+  @if $letter-spacing {
+    letter-spacing: calculate-em-px($letter-spacing, $font-size);
+  }
 }

data/typey.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.homepage     = 'http://github.com/jptaranto/typey'
   spec.rubyforge_project =
 
-  spec.version      = '1.0.3'
-  spec.date         = '2016-07-19'
+  spec.version      = '1.1.1'
+  spec.date         = '2017-01-16'
   spec.licenses     = ['GPL-2']
 
   spec.authors      = ['Jack Taranto']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typey
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Jack Taranto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 1.0.3
+rubyforge_project: 1.1.1
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4