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

data/stylesheets/typey/_line-height.scss

@@ -1,63 +0,0 @@
-// Generate a value to be used as line-height from either:
-//   a) a multiple of $base-line-height
-//   b) a static px or pt value
-//
-// Example usage with multiple:
-//   line-height: line-height(2);
-// Example usage with static value:
-//   line-height: line-height(18px);
-//
-// @param number $x
-//   Multiple of line height to be used or px/pt 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 line-height($x, $context: $base-font-size) {
-  @if type-of($x) == "number" and unitless($x) {
-    @return output-from-multiplier($x, $context);
-  }
-  @if type-of($x) == "number" and not unitless($x) {
-    @if unit($x) == px {
-      @return convert-unit($x, $context);
-    }
-    @else {
-      @error "line-height() only accepts unitless numbers or values in px";
-    }
-  }
-  @else {
-    @error "line-height() only accepts unitless numbers or values in px";
-  }
-}
-
-// Define line-height (with fallback).
-// This is only necessary to use if you want to provide fallbacks when you are
-// using rem as $base-unit.
-//
-// @param number $x
-//   Multiple of line height to be used or px/pt 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 line-height($x, $context: $base-font-size) {
-  @if $base-unit == rem {
-    @if $rem-fallback == true {
-      @if type-of($x) == "number" and unitless($x) {
-        line-height: $x * $base-line-height;
-      }
-      @if type-of($x) == "number" and not unitless($x) {
-        @if unit($x) == px {
-          line-height: $x;
-        }
-        @else {
-          @error "line-height() only accepts unitless numbers or values in px";
-        }
-      }
-    }
-  }
-  line-height: line-height($x, $context);
-}

data/stylesheets/typey/_type-layout.scss

@@ -1,49 +0,0 @@
-// 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 $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.
-@mixin type-layout($size, $x, $context: $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) {
-        $unit: unit($size);
-        @if $unit == px {
-          font-size: $size;
-        }
-        @else {
-          @warn "font-size() only accepts values in px";
-        }
-      }
-      @if type-of($x) == "number" and unitless($x) {
-        line-height: $x * $base-line-height;
-      }
-      @if type-of($x) == "number" and not unitless($x) {
-        line-height: $x;
-      }
-    }
-  }
-  @if $base-unit == rem or $base-unit == px {
-    font-size: font-size($size);
-    line-height: line-height($x);
-  }
-  @if $base-unit == em {
-    @if $size == $context {
-      font-size: font-size($size, $base-font-size);
-      line-height: line-height($x, $size);
-    }
-    @else {
-      font-size: font-size($size, $context);
-      line-height: line-height($x, $size);
-    }
-  }
-}