Skip to content

Commit

Permalink
fix(menu): do not override --ion-color-base
Browse files Browse the repository at this point in the history
  • Loading branch information
manucorporat committed Aug 24, 2018
1 parent 5f90dbf commit a890828
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion core/src/components/menu-button/menu-button.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// --------------------------------------------------

:host {
--ion-color-base: #{ion-color(primary, base)};
color: #{ion-color(primary, base)};
}

button {
Expand Down
4 changes: 0 additions & 4 deletions core/src/components/menu-button/menu-button.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
// MD Menu Button
// --------------------------------------------------

:host {
--ion-color-base: currentColor;
}

button {
@include padding(0, 8px);
}
Expand Down
2 changes: 0 additions & 2 deletions core/src/components/menu-button/menu-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
:host {
pointer-events: all;

color: #{current-color(base)};

text-align: center;
text-decoration: none;
text-overflow: ellipsis;
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/select/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,11 @@ export class Select {
}

@Method()
open(ev?: UIEvent): Promise<HTMLIonActionSheetElement | HTMLIonAlertElement | HTMLIonPopoverElement>{
open(ev?: UIEvent): Promise<HTMLIonActionSheetElement | HTMLIonAlertElement | HTMLIonPopoverElement> {
let selectInterface = this.interface;

if ((selectInterface === 'action-sheet' || selectInterface === 'popover') && this.multiple) {
console.warn('Select interface cannot be "' + selectInterface + '" with a multi-value select. Using the "alert" interface instead.');
console.warn(`Select interface cannot be "${selectInterface}" with a multi-value select. Using the "alert" interface instead.`);
selectInterface = 'alert';
}

Expand Down

0 comments on commit a890828

Please sign in to comment.