accoutrement 1.0.0.beta.7 → 1.0.0.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3778f9602fcebf0b5894cd6ec09eb1ad3c73d84e
-  data.tar.gz: 91bb0d3f17ced33866279929b3fada6bb2565b6a
+  metadata.gz: 9e5e06914bdd8bff64a1ad88db0d27de9d1b2608
+  data.tar.gz: d1c27387540234d5a57a8deafb04df4e930b1f5e
 SHA512:
-  metadata.gz: 34aa27edbc83b7433037875f9bd2213cdce55059e5cefddc1c008e43c308afa41ac3e10fa2eddc9b6ba811ba9f200e2cd6ddaadace6a51438af1220b1e47d2ff
-  data.tar.gz: c256634aef3cbc6f164a214332790cd03c8ad5359e1cffa855942b6ad7960db71a2f21a7c2fabef22e16bfd40b3845ec837422d726953f810c1f1751495087af
+  metadata.gz: 0cda7513e981e15f9de06674b62326cf1276a4c041580fdf72beaedabf2005823421582d1156078a0b36d3116774b79f9c4d7d04c5a98183e32dec45c1050138
+  data.tar.gz: 6fc03b6752d59ad571326460362b287b5a13865a6d77ab71716b5bcf2ec494ec22495c6e3b27549745e04c6355071c7d774b1f5451358abb11ca8acc5a6cec89

data/VERSION

@@ -1 +1 @@
-1.0.0.beta.6
+1.0.0.beta.7

data/stylesheets/accoutrement/_color.scss

@@ -1,6 +1,12 @@
 // Color Toolkit
 // =============
 
+@import "compass/utilities/color/contrast";
+
+
+// Config
+// ------
+
 $colors: () !default;
 
 
@@ -17,14 +23,16 @@ $colors: () !default;
 // Color
 // -----
 // Access your color pallette
-@function color(
-  $color
-) {
-  $get: map-get($colors, $color) or $color;
-  $base: nth($get, 1);
-  $adjust: if(length($get) > 1, nth($get, 2), ());
+@function color($color) {
+  // Parse arguments
+  $color: map-get($colors, $color) or $color;
+  $base: nth($color, 1);
+  $adjust: if(length($color) > 1, nth($color, 2), ());
+
+  // Recursive check
   $color: if(map-has-key($colors, $base), color($base), $base);
 
+  // Adjustments
   @each $function, $values in $adjust {
     @if function-exists($function) {
       $color: call($function, $color, $values...)
@@ -35,3 +43,10 @@ $colors: () !default;
 
   @return $color;
 }
+
+
+// Contrast
+// --------
+@function contrast($color) {
+  @return contrast-color(color($color));
+}

data/stylesheets/accoutrement/_icons.scss

@@ -13,7 +13,7 @@ $icons: ();
 ) {
   &::#{$location} {
     @extend %icon;
-    content: map-get($icons, $name);
+    content: icon($name);
     @content;
   }
 }
@@ -21,10 +21,14 @@ $icons: ();
 
 // Icon [function]
 // ---------------
-@function icon(
-  $name
-) {
-  @return map-get($icons, $name),
+@function icon($icon) {
+  $icon: map-get($icons, $icon) or $icon;
+
+  @if map-has-key($icons, $icon) {
+    $icon: icon($icon);
+  }
+
+  @return $icon;
 }
 
 
@@ -35,7 +39,7 @@ $icons: ();
 ) {
   @each $name, $value in $map {
     @if map-has-key($icons, $value) {
-      $value: map-get($icons, $value);
+      $value: icon($value);
     }
     [data-icon='#{$name}']:before { content: '#{$value}'; }
   }

data/stylesheets/accoutrement/_maps.scss

@@ -99,8 +99,38 @@
       #{$key} {
         @include render($value);
       }
+    } @else if $key == 'extend' {
+      @extend #{$value};
     } @else {
       #{$key}: $value;
     }
   }
 }
+
+
+// Parse
+// -----
+@function parse(
+  $shorthand,
+  $keywords
+){
+  @if type-of($shorthand) == map {
+    @return $shorthand;
+  } @else {
+    $return: ();
+
+    @each $item in $shorthand {
+      @if type-of($item) == map {
+        $return: map-merge($return, $item);
+      } @else {
+        @each $setting, $options in $keywords {
+          @if index($options, $item) {
+            $return: map-merge($return, ($setting: $item));
+          }
+        }
+      }
+    }
+
+    @return $return;
+  }
+}

data/stylesheets/accoutrement/_scale.scss

@@ -3,7 +3,7 @@
 
 @import "compass/typography/vertical_rhythm";
 
-$_ratio-options: (
+$ratio-options: (
   linear            : linear,
   octave            : 2,
   major-seventh     : 15/8,
@@ -19,61 +19,41 @@ $_ratio-options: (
   minor-second      : 16/15,
 );
 
+$base-size: $base-font-size !default;
 $ratio: fifth !default;
 
 
 // Sizes
 // -----
-$font-sizes: (
+$sizes: (
+  normal: 0,
+  rhythm: 1,
+
   h1: 4,
   h2: 3,
   h3: 2,
-  line: 1,
-  normal: 0,
-  small: -1,
-  smaller: -2,
-);
-
-$sizes: (
-  gutter: 1,
-);
-
 
-// Sizes
-// -----
-@mixin sizes(
-  $map
-) {
-  $sizes: map-merge($sizes, $map) !global;
-}
+  small: -1,
 
+  gutter: rhythm,
+  column: 4,
+  shim: -2,
 
-// Sizes
-// -----
-@mixin font-sizes(
-  $map
-) {
-  $font-sizes: map-merge($font-sizes, $map) !global;
-}
+  corners: shim,
+);
 
 
-// Make Size
-// ---------
-@function _make-size(
-  $size,
-  $root: $base-font-size,
-  $ratio: $ratio
+// Rem
+// ---
+@function _rem(
+  $size
 ) {
-  $_return: false;
-
-  @if type-of($ratio) == string {
-    $ratio: map-get($_ratio-options, $ratio);
-  }
+  $_return: $size;
 
-  @if $ratio == linear {
-    $_return: round($root * $size);
-  } @else {
-    $_return: round($root * pow($ratio, $size));
+  @if type-of($size) == number
+    and not unitless($size)
+    and unit($size) != rem {
+    $_return: convert-length($size, rem);
   }
 
   @return $_return;
@@ -83,40 +63,30 @@ $sizes: (
 // Get Size
 // --------
 @function _get-size(
-  $size,
-  $unit: $rhythm-unit,
-  $scale: $sizes
+  $size
 ) {
-  @if type-of($size) == string {
-    $size: map-get($scale, $size);
-  }
-
-  @if $size and unitless($size) {
-    $size: _make-size($size);
-  }
+  $size: map-get($sizes, $size) or $size;
 
-  @if $unit == rem {
-    $size: _rem($size);
+  @if map-has-key($sizes, $size) {
+    $size: _get-size($size);
   }
 
   @return $size;
 }
 
 
-// Rem
-// ---
-@function _rem(
-  $size
+// Get Ratio
+// ---------
+@function _get-ratio(
+  $ratio: $ratio
 ) {
-  $_return: $size;
+  $ratio: map-get($ratio-options, $ratio) or $ratio;
 
-  @if type-of($size) == number
-    and not unitless($size)
-    and unit($size) != rem {
-    $_return: convert-length($size, rem);
+  @if map-has-key($ratio-options, $ratio) {
+    $ratio: _get-ratio($ratio);
   }
 
-  @return $_return;
+  @return $ratio;
 }
 
 
@@ -126,39 +96,50 @@ $sizes: (
   $size,
   $unit: $rhythm-unit
 ) {
-  @return _get-size($size, $unit, $sizes);
+  $size: _get-size($size);
+
+  @if type-of($size) == number {
+    @if unitless($size) {
+      $_ratio: _get-ratio($ratio);
+      $size: round($base-size * pow($_ratio, $size));
+    }
+
+    @if $unit == rem {
+      $size: _rem($size);
+    }
+  }
+
+  @return $size;
 }
 
 
-// Font Size (function)
-// --------------------
-@function font-size(
-  $size,
-  $unit: $rhythm-unit
+// Get Font Size
+// -------------
+@function get-font-size(
+  $size: normal,
+  $lines: false
 ) {
-  @return _get-size($size, $unit, $font-sizes);
+  @return (
+    font-size: size($size),
+    line-height: rhythm(lines-for-font-size(size($size, px))),
+  );
 }
 
 
-// Font Size (mixin)
-// -----------------
+// Font Size
+// ---------
 @mixin font-size(
   $size: normal,
   $lines: false
 ){
-  $_output: _get-font-sizes($size, $lines);
-  @include adjust-font-size-to($_output...);
+  @include render(get-font-size($size, $lines));
 }
 
 
-// Get Font Sizes
-// --------------
-@function _get-font-sizes(
-  $size: normal,
-  $lines: false
-) {
-  $_return: if($lines, (lines: $lines), ());
-  $size: font-size($size, px);
+// Square
+// ------
 
-  @return map-merge($_return, (to_size: $size));
+@mixin square($size) {
+  height: size($size);
+  width: size($size);
 }

metadata

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