Skip to content

Commit

Permalink
Fix #2031, Fix #2483
Browse files Browse the repository at this point in the history
  • Loading branch information
jgthms committed May 20, 2019
1 parent d2c9e60 commit f56e437
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
1 change: 1 addition & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 21 additions & 16 deletions sass/utilities/functions.sass
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit f56e437

Please sign in to comment.