From: Jeremy Thomas Date: Sun, 8 Apr 2018 15:06:57 +0000 (+0100) Subject: Fix travis builds X-Git-Tag: 0.7.0~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e73df0289ea11470af4452abd091a7ba0cf76a1;p=thirdparty%2Fbulma.git Fix travis builds --- diff --git a/sass/utilities/functions.sass b/sass/utilities/functions.sass index 3f316be5f..acd3e839c 100644 --- a/sass/utilities/functions.sass +++ b/sass/utilities/functions.sass @@ -1,29 +1,35 @@ @function mergeColorMaps($bulma-colors, $custom-colors) // we return at least bulma hardcoded colors $merged-colors: $bulma-colors + // 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 @if type-of($name) == 'string' and (type-of($components) == 'list' or type-of($components) == 'color') and length($components) >= 1 $color-base: null - // only a single color is provided + + // the param can either be a single color + // or a list of 2 colors @if type-of($components) == 'color' $color-base: $components - // a list of colors is provided @else if type-of($components) == 'list' $color-base: nth($components, 1) + $color-invert: null - // is an inverted color provided ? + // 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: findColorInvert($color-base) + // 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))) + @return $merged-colors @function powerNumber($number, $exp)