-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(note): separate note from item so its styles will alway be applied
this was discussed with Ben previously, fixes #9173
- Loading branch information
1 parent
8ae9047
commit bf00803
Showing
13 changed files
with
111 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
@import "../../themes/ionic.globals.ios"; | ||
|
||
// iOS Note | ||
// -------------------------------------------------- | ||
|
||
/// @prop - Text color of the note | ||
$note-ios-color: darken($list-ios-border-color, 10%) !default; | ||
|
||
|
||
.note-ios { | ||
color: $note-ios-color; | ||
} | ||
|
||
|
||
// Generate iOS Note Colors | ||
// -------------------------------------------------- | ||
|
||
@each $color-name, $color-base, $color-contrast in get-colors($colors-ios) { | ||
|
||
.note-ios-#{$color-name} { | ||
color: $color-base; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
@import "../../themes/ionic.globals.md"; | ||
|
||
// Material Design Note | ||
// -------------------------------------------------- | ||
|
||
/// @prop - Text color of the note | ||
$note-md-color: darken($list-md-border-color, 10%) !default; | ||
|
||
|
||
.note-md { | ||
color: $note-md-color; | ||
} | ||
|
||
|
||
// Generate Material Design Note Colors | ||
// -------------------------------------------------- | ||
|
||
@each $color-name, $color-base, $color-contrast in get-colors($colors-md) { | ||
|
||
.note-md-#{$color-name} { | ||
color: $color-base; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,34 @@ | ||
import { Directive } from '@angular/core'; | ||
import { Directive, ElementRef, Input, Renderer } from '@angular/core'; | ||
|
||
import { Config } from '../../config/config'; | ||
import { Ion } from '../ion'; | ||
|
||
/** | ||
* @private | ||
*/ | ||
@Directive({ | ||
selector: 'ion-note' | ||
}) | ||
export class Note {} | ||
export class Note extends Ion { | ||
|
||
/** | ||
* @input {string} The predefined color to use. For example: `"primary"`, `"secondary"`, `"danger"`. | ||
*/ | ||
@Input() | ||
set color(val: string) { | ||
this._setColor(val); | ||
} | ||
|
||
/** | ||
* @input {string} The mode to apply to this component. | ||
*/ | ||
@Input() | ||
set mode(val: string) { | ||
this._setMode(val); | ||
} | ||
|
||
constructor(config: Config, elementRef: ElementRef, renderer: Renderer) { | ||
super(config, elementRef, renderer, 'note'); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
@import "../../themes/ionic.globals.wp"; | ||
|
||
// Windows Note | ||
// -------------------------------------------------- | ||
|
||
/// @prop - Text color of the note | ||
$note-wp-color: $input-wp-border-color !default; | ||
|
||
|
||
.note-wp { | ||
color: $note-wp-color; | ||
} | ||
|
||
|
||
// Generate Windows Note Colors | ||
// -------------------------------------------------- | ||
|
||
@each $color-name, $color-base, $color-contrast in get-colors($colors-wp) { | ||
|
||
.note-wp-#{$color-name} { | ||
color: $color-base; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters