Skip to content

Commit

Permalink
fix(button): fix ios buttons in colored toolbar so they don't use the…
Browse files Browse the repository at this point in the history
… default color

fixes ionic-team#8566
  • Loading branch information
brandyscarney committed Nov 10, 2016
1 parent b00860b commit 0e53ec3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/components/toolbar/test/colors/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<ion-toolbar no-border-top color="secondary">
<ion-buttons start>
<button ion-button icon-only solid>
<button ion-button icon-only color="primary">
<ion-icon name="contact"></ion-icon>
</button>
<button ion-button icon-left solid>
Expand All @@ -79,7 +79,7 @@

<ion-toolbar no-border-top color="secondary">
<ion-buttons start>
<button ion-button icon-only solid class="activated">
<button ion-button icon-only color="primary" class="activated">
<ion-icon name="contact"></ion-icon>
</button>
<button ion-button icon-left solid class="activated">
Expand Down
6 changes: 6 additions & 0 deletions src/components/toolbar/toolbar.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ ion-footer .toolbar-ios:last-child .toolbar-background,
.bar-button-default-ios {
color: $color-contrast;
}

@each $color-name, $color-base, $color-contrast in get-colors($colors-ios) {
@include ios-bar-button-default($color-name, $color-base, $color-contrast);
@include ios-bar-button-outline($color-name, $color-base, $color-contrast);
@include ios-bar-button-solid($color-name, $color-base, $color-contrast);
}
}
}

Expand Down

0 comments on commit 0e53ec3

Please sign in to comment.