diff --git a/src/components/toolbar/toolbar.md.scss b/src/components/toolbar/toolbar.md.scss index fa37b1af7f..9df6e00357 100644 --- a/src/components/toolbar/toolbar.md.scss +++ b/src/components/toolbar/toolbar.md.scss @@ -140,7 +140,7 @@ $toolbar-button-md-strong-font-weight: bold !default; border-color: $color-contrast; } - @each $color-name, $color-base, $color-contrast in get-colors($colors-md) { + @each $color-name, $color-base, $color-contrast in get-colors($colors-md, md) { @include md-bar-button-default($color-name, $color-base, $color-contrast); @include md-bar-button-outline($color-name, $color-base, $color-contrast); @include md-bar-button-solid($color-name, $color-base, $color-contrast); @@ -384,7 +384,7 @@ $toolbar-button-md-strong-font-weight: bold !default; @include md-bar-button-default(default, $toolbar-md-button-color, color-contrast($colors-md, $toolbar-md-button-color, md)); @include md-bar-button-default(clear, $toolbar-md-button-color, color-contrast($colors-md, $toolbar-md-button-color, md)); -@each $color-name, $color-base, $color-contrast in get-colors($colors-md) { +@each $color-name, $color-base, $color-contrast in get-colors($colors-md, md) { @include md-toolbar-theme($color-name, $color-base, $color-contrast); @include md-bar-button-default($color-name, $color-base, $color-contrast); @include md-bar-button-outline($color-name, $color-base, $color-contrast); diff --git a/src/themes/ionic.functions.scss b/src/themes/ionic.functions.scss index 682ea4734b..6a079fb737 100644 --- a/src/themes/ionic.functions.scss +++ b/src/themes/ionic.functions.scss @@ -271,7 +271,7 @@ // @param {Map} $colors - colors map // @return {List} $color-name, $color-base, $color-contrast // ---------------------------------------------------------- -@function get-colors($colors) { +@function get-colors($colors, $custom-contrast-mode: null) { $colors-list: (); @each $color-name, $color-value in $colors { @@ -283,7 +283,7 @@ $color-contrast: map-get($color-value, contrast); } @else { $color-base: $color-value; - $color-contrast: color-inverse($color-value); + $color-contrast: color-contrast($colors, $color-value, $custom-contrast-mode); } $colors-list: append($colors-list, ($color-name, $color-base, $color-contrast), comma); @@ -291,3 +291,4 @@ @return $colors-list; } +