accoutrement 1.0.0.beta.5 → 1.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6113c8ffa40d18031fb884cc8ec0ab9bca40e9da
-  data.tar.gz: 5ff1394a1d64ebcfefb2f203e47df0e461178ec9
+  metadata.gz: 34801ed7c6e6efa12bf103f41a65631e2800e4ae
+  data.tar.gz: c46c5cdf1a77cdd330218d10f785ff34ff0cadb9
 SHA512:
-  metadata.gz: fc3f9022a44e6f7293d12db70f188112ab6c86bd973dea42e3d1bab556757740650f388c27b07b39d967360fa705b7dc21d85edd6d2d8e2edc51ffe82736f2d1
-  data.tar.gz: d7eea6510ac33b7b5589158abefbb66cdef24aea852d67f3dffd3da4245ed58f86baeb4efe9630dde34f8801798cd1efbd2a0a0f10288cc6f9506a3766d561b2
+  metadata.gz: 1dff82ba0c3addbe14cd01c00dfb0e6e44b75ceeb2692701909bfc33ce854eeb9504feffc21f43acb75173485705bcdcc98956955724761c4edd16382d9b31d2
+  data.tar.gz: f1341ceb72fe625a02131a89bd2a911ca50e0a8a2c20a73c4bc624f5a3055e6578a6a135b3e14ff59f652ff9c05eb0ec4bdcfc3aa519e977036c8bf989dde3ca

data/VERSION

@@ -1 +1 @@
-1.0.0.beta.4
+1.0.0.beta.5

data/stylesheets/accoutrement/_color.scss

@@ -1,19 +1,8 @@
 // Color Toolkit
 // =============
 
-$color-functions: (
-  hue: adjust-hue,
-  lightness: scale-lightness,
-  saturation: scale-saturation,
-  alpha: rgba,
-) !default;
-
-$base-colors: () !default;
 $colors: () !default;
 
-$contrasted-dark-default: #000 !default;
-$contrasted-light-default: #fff !default;
-
 
 // Colors
 // ------
@@ -29,81 +18,18 @@ $contrasted-light-default: #fff !default;
 // -----
 // Access your color pallette
 @function color(
-  $name
-) {
-  $_return: $name;
-
-  @if color-get($name) {
-    $_return: make-color($name);
-  }
-
-  @if type-of($_return) != color {
-    @warn "#{$name} is not a valid color option."
-  }
-
-  @return $_return;
-}
-
-
-// Make Color
-// ----------
-// Create new colors based on existing colors
-@function make-color(
   $color
 ) {
-  $_base: null;
-  $_adjustments: ();
-  $_return: $color;
-
-  @if type-of($_return) != color {
-    @each $arg in $color {
-      @if type-of($arg) == map {
-        $_adjustments: $arg;
-      } @else {
-        $_base: if($_base, join($_base, $arg), $arg);
-      }
-    }
+  $get: map-get($colors, $color) or $color;
+  $base: nth($get, 1);
+  $adjust: if(length($get) > 1, nth($get, 2), ());
+  $color: if(type-of($base) == color, $base, color($base));
 
-    @if type-of($_base) != color {
-      @if color-get($_base) {
-        $_base: make-color(color-get($_base));
-      } @else {
-        @warn "#{$_base} is not a valid color."
-      }
-    }
-
-    $_return: _color-adjustments($_base, $_adjustments);
-  }
-
-  @return $_return;
-}
-
-
-// Color Get
-// ---------
-@function color-get(
-  $key
-) {
-  @return map-get($colors, $key) or map-get($base-colors, $key);
-}
-
-
-// Color Adjustments
-// -----------------
-@function _color-adjustments(
-  $color,
-  $adjustments
-) {
-  @each $function, $value in $adjustments {
-    $function: map-get($color-functions, $function) or $function;
+  @each $function, $values in $adjust {
     @if function-exists($function) {
-      @if $value {
-        $color: call($function, $color, $value...);
-      } @else {
-        $color: call($function, $color);
-      }
+      $color: call($function, $color, $values...)
     } @else {
-      @warn "#{$function}() is not a valid function."
+      @warn "#{$function} is not a valid color function.";
     }
   }
 

data/stylesheets/accoutrement/_scale.scss

@@ -22,45 +22,20 @@ $_ratio-options: (
 $ratio: fifth !default;
 
 
-// Make Size
-// ---------
-@function make-size(
-  $size,
-  $root: $base-font-size,
-  $ratio: $ratio
-) {
-  $_return: false;
-
-  @if type-of($ratio) == string {
-    $ratio: map-get($_ratio-options, $ratio);
-  }
-
-  @if $ratio == linear {
-    $_return: round($root * $size);
-  } @else {
-    $_return: round($root * pow($ratio, $size));
-  }
-
-  @return $_return;
-}
-
-
 // Sizes
 // -----
 $font-sizes: (
-  xxxlarge: make-size(4),
-  xxlarge: make-size(3),
-  xlarge: make-size(2),
-  large: make-size(1),
-  normal: make-size(0),
-  small: make-size(-1),
-  xsmall: make-size(-2),
-  xxsmall: make-size(-3),
-  xxxsmall: make-size(-4),
+  h1: 4,
+  h2: 3,
+  h3: 2,
+  line: 1,
+  normal: 0,
+  small: -1,
+  smaller: -2,
 );
 
 $sizes: (
-  base: make-size(0),
+  gutter: 1,
 );
 
 
@@ -82,9 +57,32 @@ $sizes: (
 }
 
 
+// Make Size
+// ---------
+@function _make-size(
+  $size,
+  $root: $base-font-size,
+  $ratio: $ratio
+) {
+  $_return: false;
+
+  @if type-of($ratio) == string {
+    $ratio: map-get($_ratio-options, $ratio);
+  }
+
+  @if $ratio == linear {
+    $_return: round($root * $size);
+  } @else {
+    $_return: round($root * pow($ratio, $size));
+  }
+
+  @return $_return;
+}
+
+
 // Get Size
 // --------
-@function get-size(
+@function _get-size(
   $size,
   $unit: $rhythm-unit,
   $scale: $sizes
@@ -93,8 +91,12 @@ $sizes: (
     $size: map-get($scale, $size);
   }
 
+  @if $size and unitless($size) {
+    $size: _make-size($size);
+  }
+
   @if $unit == rem {
-    $size: rem($size);
+    $size: _rem($size);
   }
 
   @return $size;
@@ -103,7 +105,7 @@ $sizes: (
 
 // Rem
 // ---
-@function rem(
+@function _rem(
   $size
 ) {
   $_return: $size;
@@ -124,7 +126,7 @@ $sizes: (
   $size,
   $unit: $rhythm-unit
 ) {
-  @return get-size($size, $unit, $sizes);
+  @return _get-size($size, $unit, $sizes);
 }
 
 
@@ -134,12 +136,12 @@ $sizes: (
   $size,
   $unit: $rhythm-unit
 ) {
-  @return get-size($size, $unit, $font-sizes);
+  @return _get-size($size, $unit, $font-sizes);
 }
 
 
-// Font Size (function)
-// --------------------
+// Font Size (mixin)
+// -----------------
 @mixin font-size(
   $size: normal,
   $lines: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accoutrement
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.5
+  version: 1.0.0.beta.6
 platform: ruby
 authors:
 - Eric M. Suzanne