chroma-sass 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a312c206373fd7962458d914a95875ceb10d527
-  data.tar.gz: a082d68f58580dea5cb07d4def579fbea427c0d7
+  metadata.gz: 8ceadf1166d4eed5e358a52f1cf37051b66c664d
+  data.tar.gz: d86c220ce440325800a5bfb9302e9bcdb47dcab4
 SHA512:
-  metadata.gz: fb1bc718303f4adf0e12a5e395d4adeb513c36b7ee44af360dbf54d1e134751cc400676b87c064f0d75780f06296901e21c5e7365b5d5b96e143fdd7df4fd2cf
-  data.tar.gz: f3ef8397d105ae7639a5215a9882bfbd01c74c01f7ac466242cc31262e80075d18354d48ae74273f60795b62b2cb7fd647d7b8fec734d642a7f63ea72da65e78
+  metadata.gz: aeb4741cf26f39a898aab712e9dc960cbff2739a860f31f05fbd04e516bcdb957616485f9d0ad2083a6386ffb8df8579fedd394a6c205d945c710786c236736c
+  data.tar.gz: 5050e3b0efa2b7cba7b1252d21bb38acdb8852b89d313b842c53a25f2b7656b7cbf6b5a261dad6e46db528d3997cad019a7ce5bbe046c2194ddb053406e5c853

data/chroma-sass.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.homepage     = 'http://github.com/JohnAlbin/chroma'
   spec.rubyforge_project =
 
-  spec.version      = '1.1.1'
-  spec.date         = '2015-09-24'
+  spec.version      = '1.1.2'
+  spec.date         = '2015-09-27'
   spec.licenses     = ['GPL-2']
 
   spec.authors      = ['John Albin Wilkins']

data/sass/chroma/_functions.scss

@@ -253,10 +253,12 @@ $chroma: _chroma-init();
     ))
   );
 
-  @return map-merge(
+  $chroma: map-merge(
     $chroma,
     ('schemes': $schemes)
-  );
+  ) !global;
+
+  @return $chroma;
 }
 
 // define-default-color-scheme([$name,] $description)
@@ -302,7 +304,7 @@ $chroma: _chroma-init();
   }
   $CHROMA_DEFAULT_SCHEME: $name !global;
   // Add the default scheme (and the updated schemes) back into $chroma.
-  @return map-merge(
+  $chroma: map-merge(
     $chroma,
     ('schemes': map-merge(
       $schemes,
@@ -311,7 +313,9 @@ $chroma: _chroma-init();
         'parent': false,
       ))
     ))
-  );
+  ) !global;
+
+  @return $chroma;
 }
 
 // add-colors([$scheme,] $colors)
@@ -437,38 +441,11 @@ $chroma: _chroma-init();
   @return $chroma;
 }
 
-// define-skin($scheme, $selector)
-//
-// Defines that the specified color scheme can be used as a skin when the
-// given parent selector matches our HTML. See the `skin()` mixin.
-//
-// Usage:
-// ```scss
-// $chroma: define-skin('scheme1', '.is-scheme1-skin');
-// ```
-//
-// $scheme   - Name of the color scheme to use when the `$selector` matches our
-//             HTML.
-// $selector - A CSS parent selector that triggers the use of the defined
-//             `$scheme` instead of the default color scheme. We recommend using
-//             a simple CSS selector like `.is-CUSTOMNAME-skin`.
-//
-// Style guide: skin.define-skin
-@function define-skin($scheme, $selector) {
-  $skins: map-merge(
-    map-get($chroma, 'skins'),
-    ($scheme: $selector)
-  );
-
-  @return map-merge(
-    $chroma,
-    ('skins': $skins)
-  );
-}
-
 // define-skins($skins)
 //
-// Helper function to define multiple skins at once.
+// Defines one or more color schemes as being a skin. For each of the specified
+// color schemes, `define-skins()` will tell Chroma to use the scheme with the
+// corresponding CSS selector when the `skin()` mixin is used.
 //
 // Usage:
 // ```scss
@@ -479,12 +456,42 @@ $chroma: _chroma-init();
 // ));
 // ```
 //
-// $skins - A list of color schemes and their A CSS parent selectors
+// $skins - A map of color schemes and their CSS parent selectors. Each key in
+// the map must be the name of an existing color scheme. The value of each key
+// is the CSS parent selector that triggers the use of the defined scheme
+// instead of the default color scheme. We recommend using a simple CSS selector
+// like `.is-CUSTOMNAME-skin`.
 //
 // Style guide: skin.define-skins
 @function define-skins($skins) {
   @each $scheme, $selector in $skins {
-    $chroma: define-skin($scheme, $selector) !global;
+    @if not chroma-has-scheme($scheme) {
+      @error 'The #{$_chroma-spelling} scheme "#{$scheme}" was not found.';
+    }
+    @if type-of($selector) != 'string' {
+      @error 'The selector for the #{$scheme} skin was a #{type-of($selector)}, but should be a string.';
+    }
   }
+
+  $chroma: map-merge(
+    $chroma,
+    ('skins': map-merge(
+      map-get($chroma, 'skins'),
+      $skins
+    ))
+  ) !global;
+
   @return $chroma;
 }
+
+// define-skin($scheme, $selector)
+//
+// Deprecated: Will be removed in Chroma 2.0.0. Use `define-skins()` instead.
+//
+// Weight: 100
+//
+// Style guide: skin.define-skin
+@function define-skin($scheme, $selector) {
+  @warn "The define-skin() function is deprecated. Use define-skins() instead.";
+  @return define-skins(($scheme: $selector));
+}

data/sass/chroma/_skin.scss

@@ -38,7 +38,7 @@
 // ```
 //
 // $skins - An optional list of color scheme names and selectors to use instead
-//          of the skins defined with `define-skin()`. The format of this list
+//          of the skins defined with `define-skins()`. The format of this list
 //          should match that of the `$skins` parameter in `define-skins()`.
 //
 // Style guide: skin.skin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chroma-sass
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - John Albin Wilkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 1.1.1
+rubyforge_project: 1.1.2
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4