typey 1.0.0.beta.5 → 1.0.0.beta.6

data/stylesheets/typey/{_margin.scss → mixins/_margin.scss}

@@ -1,25 +1,3 @@
-// Generate a value to be used as margin from either:
-//   a) a multiple of $base-line-height
-//   b) a static px or pt value
-//
-// Example usage with multiple:
-//   margin: margin(2);
-// Example usage with static value:
-//   margin: margin(18px);
-//
-// @param number $x
-//   Multiple of line height to be used or px value to be converted.
-// @param number|string $context
-//   (optional) Only used if em is the $base-unit. The value of the elements/parents
-//   font-size if it differs from $base-font-size. Specified as a t-shirt size or
-//   value in px.
-//
-// @return number
-//   The calculated height in $base-unit.
-@function margin($x, $context: $base-font-size) {
-  @return line-height($x, $context);
-}
-
 // Define margin (with fallback).
 // This is only necessary to use if you want to provide fallbacks when you are
 // using rem as $base-unit.
@@ -33,21 +11,28 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin margin($list, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px", "list";
+  $type: typey-validator($list, $allowed-types);
+
   $px-list: ();
   $converted-list: ();
+
   @each $x in $list {
     @if $base-unit == rem {
-      @if type-of($x) == "number" and unitless($x) {
+      $allowed-types: "multiplier", "px";
+      $type: typey-validator($x, $allowed-types);
+      @if $type == "multiplier" {
         $margin: $x * $base-line-height;
         $px-list: join($px-list, $margin, $separator: space);
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         $px-list: join($px-list, $x, $separator: space);
       }
     }
-    $margin: line-height($x, $context);
+    $margin: margin($x, $context);
     $converted-list: join($converted-list, $margin, $separator: space);
   }
+
   @if $base-unit == rem {
     @if $rem-fallback == true {
       margin: $px-list;
@@ -67,17 +52,19 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin margin-top($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         margin-top: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         margin-top: $x;
       }
     }
   }
-  margin-top: line-height($x, $context);
+  margin-top: margin($x, $context);
 }
 
 // Define margin-bottom (with fallback).
@@ -91,17 +78,19 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin margin-bottom($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         margin-bottom: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         margin-bottom: $x;
       }
     }
   }
-  margin-bottom: line-height($x, $context);
+  margin-bottom: margin($x, $context);
 }
 
 // Define margin-left (with fallback).
@@ -115,17 +104,19 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin margin-left($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         margin-left: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         margin-left: $x;
       }
     }
   }
-  margin-left: line-height($x, $context);
+  margin-left: margin($x, $context);
 }
 
 // Define margin-right (with fallback).
@@ -139,15 +130,17 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin margin-right($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         margin-right: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         margin-right: $x;
       }
     }
   }
-  margin-right: line-height($x, $context);
+  margin-right: margin($x, $context);
 }

data/stylesheets/typey/{_padding.scss → mixins/_padding.scss}

@@ -1,25 +1,3 @@
-// Generate a value to be used as padding from either:
-//   a) a multiple of $base-line-height
-//   b) a static px or pt value
-//
-// Example usage with multiple:
-//   padding: padding(2);
-// Example usage with static value:
-//   padding: padding(18px);
-//
-// @param number $x
-//   Multiple of line height to be used or px value to be converted.
-// @param number|string $context
-//   (optional) Only used if em is the $base-unit. The value of the elements/parents
-//   font-size if it differs from $base-font-size. Specified as a t-shirt size or
-//   value in px.
-//
-// @return number
-//   The calculated height in $base-unit.
-@function padding($x, $context: $base-font-size) {
-  @return line-height($x, $context);
-}
-
 // Define padding (with fallback).
 // This is only necessary to use if you want to provide fallbacks when you are
 // using rem as $base-unit.
@@ -33,21 +11,28 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin padding($list, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px", "list";
+  $type: typey-validator($list, $allowed-types);
+
   $px-list: ();
   $converted-list: ();
+
   @each $x in $list {
     @if $base-unit == rem {
-      @if type-of($x) == "number" and unitless($x) {
+      $allowed-types: "multiplier", "px";
+      $type: typey-validator($x, $allowed-types);
+      @if $type == "multiplier" {
         $padding: $x * $base-line-height;
         $px-list: join($px-list, $padding, $separator: space);
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         $px-list: join($px-list, $x, $separator: space);
       }
     }
-    $padding: line-height($x, $context);
+    $padding: padding($x, $context);
     $converted-list: join($converted-list, $padding, $separator: space);
   }
+
   @if $base-unit == rem {
     @if $rem-fallback == true {
       padding: $px-list;
@@ -67,17 +52,19 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin padding-top($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         padding-top: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         padding-top: $x;
       }
     }
   }
-  padding-top: line-height($x, $context);
+  padding-top: padding($x, $context);
 }
 
 // Define padding-bottom (with fallback).
@@ -91,17 +78,19 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin padding-bottom($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         padding-bottom: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         padding-bottom: $x;
       }
     }
   }
-  padding-bottom: line-height($x, $context);
+  padding-bottom: padding($x, $context);
 }
 
 // Define padding-left (with fallback).
@@ -115,17 +104,19 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin padding-left($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         padding-left: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         padding-left: $x;
       }
     }
   }
-  padding-left: line-height($x, $context);
+  padding-left: padding($x, $context);
 }
 
 // Define padding-right (with fallback).
@@ -139,15 +130,17 @@
 //   font-size if it differs from $base-font-size. Specified as a t-shirt size or
 //   value in px.
 @mixin padding-right($x, $context: $base-font-size) {
+  $allowed-types: "multiplier", "px";
+  $type: typey-validator($x, $allowed-types);
   @if $base-unit == rem {
     @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
+      @if $type == "multiplier" {
         padding-right: $x * $base-line-height;
       }
-      @if type-of($x) == "number" and not unitless($x) {
+      @if $type == "px" {
         padding-right: $x;
       }
     }
   }
-  padding-right: line-height($x, $context);
+  padding-right: padding($x, $context);
 }

data/stylesheets/typey/mixins/_type-layout.scss

@@ -0,0 +1,53 @@
+// Define a type layout (font-size and line-height).
+//
+// @param number|string $size
+//   A size from the $font-size map or a px value.
+// @param number $line-height
+//   Multiple of line height to be used or px value to be converted.
+// @param number|string $context
+//   (optional) Only used if em is the $base-unit. The value of the
+//   elements/parents font-size if it differs from $base-font-size.
+//   Specified as a t-shirt size or value in px.
+@mixin type-layout($size, $line-height: $base-line-height-ratio, $context: $size) {
+  $allowed-types-size: "font-size", "px";
+  $type-size: typey-validator($size, $allowed-types-size);
+
+  $allowed-types-lh: "multiplier", "px";
+  $type-lh: typey-validator($line-height, $allowed-types-lh);
+
+  @if $base-unit == rem {
+    @if $rem-fallback == true {
+      @if $type-size == "font-size" {
+        $map-size: map-get($font-size, $size);
+        font-size: $map-size;
+      }
+      @if $type-size == "px" {
+        font-size: $size;
+      }
+    }
+    @if $rem-fallback {
+      @if $type-lh == "multiplier" and $line-height-method == "rhythm" {
+        line-height: $line-height * $base-line-height;
+      }
+      @if $type-lh == "px" {
+        line-height: $line-height;
+      }
+    }
+  }
+
+  @if $base-unit == rem or $base-unit == px {
+    font-size: font-size($size);
+    line-height: line-height($line-height, $context);
+  }
+
+  @if $base-unit == em {
+    @if $size == $context {
+      font-size: font-size($size, $base-font-size);
+      line-height: line-height($line-height, $size);
+    }
+    @else {
+      font-size: font-size($size, $context);
+      line-height: line-height($line-height, $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.0.beta.5'
-  spec.date         = '2015-07-06'
+  spec.version      = '1.0.0.beta.6'
+  spec.date         = '2015-08-05'
   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.0.beta.5
+  version: 1.0.0.beta.6
 platform: ruby
 authors:
 - Jack Taranto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -36,14 +36,20 @@ files:
 - stylesheets/_typey.scss
 - stylesheets/config.codekit
 - stylesheets/typey/_defaults.scss
-- stylesheets/typey/_font-size.scss
 - stylesheets/typey/_font-stacks.scss
-- stylesheets/typey/_helpers.scss
-- stylesheets/typey/_line-height.scss
-- stylesheets/typey/_margin.scss
-- stylesheets/typey/_padding.scss
-- stylesheets/typey/_type-layout.scss
-- stylesheets/typey/_weight.scss
+- stylesheets/typey/functions/_depreciated.scss
+- stylesheets/typey/functions/_em-calculators.scss
+- stylesheets/typey/functions/_extras.scss
+- stylesheets/typey/functions/_helpers.scss
+- stylesheets/typey/functions/_outputters.scss
+- stylesheets/typey/functions/_sizers.scss
+- stylesheets/typey/functions/_validators.scss
+- stylesheets/typey/mixins/_define-type-sizing.scss
+- stylesheets/typey/mixins/_font-size.scss
+- stylesheets/typey/mixins/_line-height.scss
+- stylesheets/typey/mixins/_margin.scss
+- stylesheets/typey/mixins/_padding.scss
+- stylesheets/typey/mixins/_type-layout.scss
 - typey.gemspec
 homepage: http://github.com/jptaranto/typey
 licenses:
@@ -64,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 1.0.0.beta.5
+rubyforge_project: 1.0.0.beta.6
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4

data/stylesheets/typey/_font-size.scss

@@ -1,56 +0,0 @@
-// Takes a sizing from the $font-size map (m, xl, xxl, etc) and convert it to
-// the base unit. Alternatively convert a px font-size into the base unit.
-//
-// @param number|string $size
-//   A size from the $font-size map or px value to be converted
-// @param number|string $context
-//   (optional) Only used if em is the $base-unit. The value of the parent
-//   font-size if it differs from $base-font-size. Specified as a t-shirt size or
-//   value in px.
-//
-// @return number
-//   The selected font-size in $base-unit.
-@function font-size($size, $context: $base-font-size) {
-  @if type-of($size) == "string" {
-    @return output-from-font-size-map($size, $context);
-  }
-  @if type-of($size) == "number" and not unitless($size) {
-    @if unit($size) == px {
-      @return convert-unit($size, $context);
-    }
-    @else {
-      @error "font-size() only accepts keys from the $font-size map or values in px";
-    }
-  }
-  @else {
-    @error "font-size() only accepts keys from the $font-size map or values in px";
-  }
-}
-
-// Define font-size (with fallback)
-//
-// @param number|string $size
-//   A size from the $font-size map or px value to be converted
-// @param number|string $context
-//   (optional) Only used if em is the $base-unit. The value of the elements/parents
-//   font-size if it differs from $base-font-size. Specified as a t-shirt size or
-//   value in px.
-@mixin font-size($size, $context: $base-font-size) {
-  @if $base-unit == rem {
-    @if $rem-fallback == true {
-      @if type-of($size) == "string" {
-        $map-size: map-get($font-size, $size);
-        font-size: $map-size;
-      }
-      @if type-of($size) == "number" and not unitless($size) {
-        @if unit($size) == px {
-          font-size: $size;
-        }
-        @else {
-          @error "font-size() only accepts keys from the $font-size map or values in px";
-        }
-      }
-    }
-  }
-  font-size: font-size($size, $context);
-}

data/stylesheets/typey/_helpers.scss

@@ -1,171 +0,0 @@
-// 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 == rem {
-    @return $number * 1rem;
-  }
-  @if $base-unit == px {
-    @return $number * 1px;
-  }
-  @if $base-unit == em {
-    @return $number * 1em;
-  }
-}
-
-// Remove the unit from a number.
-//
-// @param number $number
-//   The number (with unit) to convert. Allowed units: any
-//
-// @return number
-//   The number without the unit.
-@function strip-unit($number) {
-  @if type-of($number) == "number" and not unitless($number) {
-    @return $number / ($number * 0 + 1);
-  }
-  @return $number;
-}
-
-// Convert px to the $base-unit.
-//
-// @param number $number
-//   The number (with unit) to convert. Allowed units: px
-// @param number|string $context
-//   (optional) Only used if em is the $base-unit. The value of the elements/parents
-//   font-size if it differs from $base-font-size. Specified as a t-shirt size or
-//   value in px.
-//
-// @return number
-//   The number converted to the base unit.
-@function convert-unit($number, $context: $base-font-size) {
-  @if type-of($number) == "number" and not unitless($number) {
-    $unit: unit($number);
-    @if $unit == px {
-      @if $base-unit == rem {
-        @return output-unit(($number / $base-font-size));
-      }
-      @if $base-unit == px {
-        @return output-unit(strip-unit($number));
-      }
-      @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(($number / $context-map-size));
-          }
-          @else {
-            @error "'#{$context}' not found in $font-size map";
-          }
-        }
-        @if type-of($context) == "number" and not unitless($number) {
-          @if unit($context) == px {
-            @return output-unit(($number / $context));
-          }
-          @else {
-            @error "The unit used for $context must be px";
-          }
-        }
-      }
-    }
-    @else {
-      @error "convert-unit() only accepts values in px";
-    }
-  }
-}
-
-// Take a line-height multipler and output converted value.
-//
-// @param number $number
-//   Multiple of line height to be used
-// @param number|string $context
-//   (optional) Only used if em is the $base-unit. The value of the elements/parents
-//   font-size if it differs from $base-font-size. Specified as a t-shirt size or
-//   value in px.
-//
-// @return number
-//   The value of the line-height multiple converted to the base unit.
-@function output-from-multiplier($x, $context: $base-font-size) {
-  @if $base-unit == rem {
-    @return output-unit(($x * $base-line-height) / $base-font-size);
-  }
-  @if $base-unit == px {
-    @return output-unit(strip-unit($x * $base-line-height));
-  }
-  @if $base-unit == em {
-    @if type-of($context) == "number" {
-      @if unit($context) == px {
-        @return output-unit(($x * $base-line-height) / $context);
-      }
-      @else {
-        @error "The unit used for $context must be px";
-      }
-    }
-    @if type-of($context) == "string" {
-      @if map-has-key($font-size, $context) {
-        $context-map-size: map-get($font-size, $context);
-        @return output-unit(($x * $base-line-height) / $context-map-size);
-      }
-      @else {
-        @error "'#{$context}' not found in $font-size map";
-      }
-    }
-    @else {
-      @error "$context must be a px value or a key from the $font-size map";
-    }
-  }
-}
-
-
-// Takes a sizing from the $font-size map (m, xl, xxl, etc) and convert it to
-// the base unit.
-//
-// @param string $size
-//   A size from the $font-size map.
-// @param number|string $context
-//   (optional) Only used if em is the $base-unit. The value of the parent
-//   font-size if it differs from $base-font-size. Specified as a t-shirt size or
-//   value in px.
-//
-// @return number
-//   The selected font-size in $base-unit.
-@function output-from-font-size-map($size, $context: $base-font-size) {
-  @if map-has-key($font-size, $size) {
-    $map-size: map-get($font-size, $size);
-    @if $base-unit == rem {
-      @return output-unit(($map-size / $base-font-size));
-    }
-    @if $base-unit == px or $base-unit == pt {
-      @return output-unit(strip-unit($map-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 {
-          @error "'#{$context}' not found in $font-size map";
-        }
-      }
-      @if type-of($context) == "number" {
-        @if unit($context) == px {
-          @return output-unit(($map-size / $context));
-        }
-        @else {
-          @error "The unit used for $context must be px";
-        }
-      }
-      @else {
-        @error "$context must be a px value or a key from the $font-size map";
-      }
-    }
-  }
-  @else {
-    @error "'#{$size}' not found in $font-size map";
-  }
-}