javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(menu): do not override --ion-color-base

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-08-24 03:39:04 +02:00
parent 5f90dbfa6f
commit a8908283c4
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/menu-button/menu-button.ios.scss
View File

@ -5,7 +5,7 @@
// -------------------------------------------------- // --------------------------------------------------
:host { :host {
--ion-color-base: #{ion-color(primary, base)}; color: #{ion-color(primary, base)};
} }
button { button {

4
core/src/components/menu-button/menu-button.md.scss
View File

@ -4,10 +4,6 @@
// MD Menu Button // MD Menu Button
// -------------------------------------------------- // --------------------------------------------------
:host {
--ion-color-base: currentColor;
}
button { button {
@include padding(0, 8px); @include padding(0, 8px);
} }

2
core/src/components/menu-button/menu-button.scss
View File

@ -6,8 +6,6 @@
:host { :host {
pointer-events: all; pointer-events: all;
color: #{current-color(base)};
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
text-overflow: ellipsis; text-overflow: ellipsis;

4
core/src/components/select/select.tsx
View File

@ -257,11 +257,11 @@ export class Select {
} }
@Method() @Method()
open(ev?: UIEvent): Promise<HTMLIonActionSheetElement | HTMLIonAlertElement | HTMLIonPopoverElement>{ open(ev?: UIEvent): Promise<HTMLIonActionSheetElement | HTMLIonAlertElement | HTMLIonPopoverElement> {
let selectInterface = this.interface; let selectInterface = this.interface;
if ((selectInterface === 'action-sheet' || selectInterface === 'popover') && this.multiple) { 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'; selectInterface = 'alert';
} }