javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(toolbar): get the correct contrast color for md mode

Browse Source 
fixes an issue introduced by the fix in #11848

references #11848
This commit is contained in:
Brandy Carney
2017-06-02 13:05:34 -04:00
parent 1c76cde986
commit 0f4ed1c7f8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/toolbar/toolbar.md.scss
View File

@ -140,7 +140,7 @@ $toolbar-button-md-strong-font-weight: bold !default;
border-color: $color-contrast; 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-default($color-name, $color-base, $color-contrast);
@include md-bar-button-outline($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); @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(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)); @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-toolbar-theme($color-name, $color-base, $color-contrast);
@include md-bar-button-default($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); @include md-bar-button-outline($color-name, $color-base, $color-contrast);

5
src/themes/ionic.functions.scss
View File

@ -271,7 +271,7 @@
// @param {Map} $colors - colors map // @param {Map} $colors - colors map
// @return {List} $color-name, $color-base, $color-contrast // @return {List} $color-name, $color-base, $color-contrast
// ---------------------------------------------------------- // ----------------------------------------------------------
@function get-colors($colors) { @function get-colors($colors, $custom-contrast-mode: null) {
$colors-list: (); $colors-list: ();
@each $color-name, $color-value in $colors { @each $color-name, $color-value in $colors {
@ -283,7 +283,7 @@
$color-contrast: map-get($color-value, contrast); $color-contrast: map-get($color-value, contrast);
} @else { } @else {
$color-base: $color-value; $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); $colors-list: append($colors-list, ($color-name, $color-base, $color-contrast), comma);
@ -291,3 +291,4 @@
@return $colors-list; @return $colors-list;
} }