From f56e43769fd97272184fbab2e76c26cbc903223a Mon Sep 17 00:00:00 2001
From: Jeremy Thomas <bbxdesign@gmail.com>
Date: Mon, 20 May 2019 21:19:36 +0100
Subject: [PATCH] Fix #2031, Fix #2483

---
 docs/.gitignore               |  1 +
 sass/utilities/functions.sass | 37 ++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/docs/.gitignore b/docs/.gitignore
index 9e3efe0a3f..a45e40535e 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -5,6 +5,7 @@
 _config.local.yml
 _config.version.yml
 _layouts/basic.html
+_layouts/dev.html
 bulma-test.sass
 bulma-test.scss
 bulma-test.css
diff --git a/sass/utilities/functions.sass b/sass/utilities/functions.sass
index acd3e839cf..da231bfd85 100644
--- a/sass/utilities/functions.sass
+++ b/sass/utilities/functions.sass
@@ -1,34 +1,39 @@
 @function mergeColorMaps($bulma-colors, $custom-colors)
-  // we return at least bulma hardcoded colors
+  // We return at least Bulma's hard-coded colors
   $merged-colors: $bulma-colors
 
-  // we want a map as input
+  // We want a map as input
   @if type-of($custom-colors) == 'map'
     @each $name, $components in $custom-colors
-      // color name should be a string and colors pair a list with at least one element
+      // The color name should be a string
+      // and the components either a single color
+      // or a colors list with at least one element
       @if type-of($name) == 'string' and (type-of($components) == 'list' or type-of($components) == 'color') and length($components) >= 1
         $color-base: null
+        $value: null
 
-        // the param can either be a single color
+        // The param can either be a single color
         // or a list of 2 colors
         @if type-of($components) == 'color'
           $color-base: $components
+          $value: $components
         @else if type-of($components) == 'list'
           $color-base: nth($components, 1)
-
-        $color-invert: null
-        // is an inverted color provided in the list
-        @if length($components) > 1
-          $color-invert: nth($components, 2)
-
-        // we only want a color as base color
-        @if type-of($color-base) == 'color'
-          // if inverted color is not provided or is not a color we compute it
-          @if type-of($color-invert) != 'color'
+          $color-invert: null
+          // Check if the invert color is provided,
+          // otherwise compute it
+          @if length($components) > 1
+            $color-invert: nth($components, 2)
+          @else
             $color-invert: findColorInvert($color-base)
+          $value: ($color-base, $color-invert)
 
-          // we merge this colors elements as map with bulma colors (we can override them this way, no multiple definition for the same name)
-          $merged-colors: map_merge($merged-colors, ($name: ($color-base, $color-invert)))
+        // We only want to merge the map if the color base is an actual color
+        @if type-of($color-base) == 'color'
+          // We merge this colors elements as map with Bulma's colors map
+          // (we can override them this way, no multiple definition for the same name)
+          // $merged-colors: map_merge($merged-colors, ($name: ($color-base, $color-invert)))
+          $merged-colors: map_merge($merged-colors, ($name: $value))
 
   @return $merged-colors