Better protection against map overwriting for multiple inclusions.

Author: AMJones

composer.json

@@ -9,7 +9,7 @@
       "strapless"
   ],
   "homepage": "https://www.github.com/strapless/colors",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "authors": [
       {
           "name": "Aaron M Jones",

scss/_colors-functions.scss

@@ -59,19 +59,25 @@
 }
 
 @function theme-colors-merge($new: ()) {
-  $theme-colors: () !default;
+  @if not(variable-exists(theme-colors)) {
+    $theme-colors: () !global;
+  }
 
   @return color-map-merge($theme-colors, $new);
 }
 
 @function colors-merge($new: ()) {
-  $colors: () !default;
+  @if not(variable-exists(colors)) {
+    $colors: () !global;
+  }
 
   @return color-map-merge($colors, $new);
 }
 
 @function grays-merge($new: ()) {
-  $grays: () !default;
+  @if not(variable-exists(grays)) {
+    $grays: () !global;
+  }
 
   @return color-map-merge($grays, $new);
 }
@@ -120,7 +126,9 @@
 // region //////////////////////////////////////////////   Other Color Functions
 
 @function isLight($color) {
-  @if (lightness($color) > 50) {
+  @if quote($color) == "transparent" {
+    @return true;
+  } @else if (lightness($color) > 50) {
     @return true;
   } @else {
     @return false;

scss/_colors-variables.scss

@@ -44,7 +44,7 @@ $colors: colors-merge((
         "gray-dark":    $gray-800,
         "gray-light":   $gray-700,
         "gray-lighter": $gray-300
-));
+)) !default;
 
 $grays: grays-merge((
         "50": $gray-50,
@@ -57,7 +57,7 @@ $grays: grays-merge((
         "700": $gray-700,
         "800": $gray-800,
         "900": $gray-900
-));
+)) !default;
 
 
 $theme-colors: theme-colors-merge((
@@ -67,6 +67,6 @@ $theme-colors: theme-colors-merge((
         "info":       $cyan,
         "warning":    $yellow,
         "danger":     $red,
-));
+)) !default;
 
 // endregion ////////////////////////////////////////////////////////////   End Color Map