From: Jeremy Thomas Date: Sat, 15 Apr 2017 17:24:31 +0000 (+0100) Subject: Fix #227 X-Git-Tag: 0.4.1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7103b1c36c90e348d94d316e645def9c576511b;p=thirdparty%2Fbulma.git Fix #227 --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 0daf40d28..c859c889a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ * Fix #187 add customize page * Fix #449 columns negative horizontal margin * Fix #399 pagination wrapping +* Fix #227 color keys as strings ## 0.4.0 diff --git a/sass/utilities/derived-variables.sass b/sass/utilities/derived-variables.sass index f9f1ac9d9..73e8a66bd 100644 --- a/sass/utilities/derived-variables.sass +++ b/sass/utilities/derived-variables.sass @@ -75,6 +75,6 @@ $size-large: $size-4 !default // Lists and maps -$colors: (white: ($white, $black), black: ($black, $white), light: ($light, $light-invert), dark: ($dark, $dark-invert), primary: ($primary, $primary-invert), info: ($info, $info-invert), success: ($success, $success-invert), warning: ($warning, $warning-invert), danger: ($danger, $danger-invert)) !default +$colors: ("white": ($white, $black), "black": ($black, $white), "light": ($light, $light-invert), "dark": ($dark, $dark-invert), "primary": ($primary, $primary-invert), "info": ($info, $info-invert), "success": ($success, $success-invert), "warning": ($warning, $warning-invert), "danger": ($danger, $danger-invert)) !default $sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6 !default diff --git a/sass/utilities/variables.sass b/sass/utilities/variables.sass index 3246c2f54..0a9b9cb86 100644 --- a/sass/utilities/variables.sass +++ b/sass/utilities/variables.sass @@ -145,6 +145,6 @@ $size-large: $size-4 !default //////////////////////////////////////////////// // 4. Lists and maps -$colors: (white: ($white, $black), black: ($black, $white), light: ($light, $light-invert), dark: ($dark, $dark-invert), primary: ($primary, $primary-invert), info: ($info, $info-invert), success: ($success, $success-invert), warning: ($warning, $warning-invert), danger: ($danger, $danger-invert)) !default +$colors: ("white": ($white, $black), "black": ($black, $white), "light": ($light, $light-invert), "dark": ($dark, $dark-invert), "primary": ($primary, $primary-invert), "info": ($info, $info-invert), "success": ($success, $success-invert), "warning": ($warning, $warning-invert), "danger": ($danger, $danger-invert)) !default $sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6 !default