-
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.
refactor(item): remove paragraph styles, update activated colors
- Adds test for item colors - Removes the color from native paragraph elements allowing colors to be passed Closes #9081
- Loading branch information
1 parent
7475133
commit e350a78
Showing
6 changed files
with
124 additions
and
12 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import { Component, NgModule } from '@angular/core'; | ||
import { IonicApp, IonicModule } from '../../../..'; | ||
|
||
|
||
@Component({ | ||
templateUrl: 'main.html' | ||
}) | ||
export class E2EPage { | ||
|
||
} | ||
|
||
@Component({ | ||
template: '<ion-nav [root]="rootPage"></ion-nav>' | ||
}) | ||
export class E2EApp { | ||
rootPage = E2EPage; | ||
} | ||
|
||
@NgModule({ | ||
declarations: [ | ||
E2EApp, | ||
E2EPage | ||
], | ||
imports: [ | ||
IonicModule.forRoot(E2EApp) | ||
], | ||
bootstrap: [IonicApp], | ||
entryComponents: [ | ||
E2EApp, | ||
E2EPage | ||
] | ||
}) | ||
export class AppModule {} |
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 @@ | ||
|
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,78 @@ | ||
<ion-header> | ||
|
||
<ion-toolbar> | ||
<ion-title>Item Colors</ion-title> | ||
</ion-toolbar> | ||
|
||
</ion-header> | ||
|
||
|
||
<ion-content> | ||
|
||
<ion-item> | ||
<ion-label color="primary">Primary label</ion-label> | ||
</ion-item> | ||
|
||
<ion-item color="dark"> | ||
<ion-label color="primary">Primary label</ion-label> | ||
</ion-item> | ||
|
||
<a ion-item href="#" color="danger"> | ||
a[ion-item] danger | ||
</a> | ||
|
||
<a ion-item href="#" color="danger" class="activated"> | ||
a[ion-item].activated danger | ||
</a> | ||
|
||
<button ion-item color="secondary"> | ||
button[ion-item] | ||
</button> | ||
|
||
<button ion-item color="secondary" class="activated"> | ||
button[ion-item].activated secondary | ||
</button> | ||
|
||
<ion-item color="primary"> | ||
<button ion-button item-left color="dark">Dark</button> | ||
Inner Buttons | ||
<p>Normal paragraph</p> | ||
<button ion-button outline item-right>Outline</button> | ||
</ion-item> | ||
|
||
<button ion-item color="dark"> | ||
<button ion-button item-left icon-left> | ||
<ion-icon name="home"></ion-icon> | ||
Left Icon | ||
</button> | ||
left icon buttons | ||
<p color="primary">Primary paragraph</p> | ||
</button> | ||
|
||
<button ion-item disabled color="dark"> | ||
<button ion-button item-left icon-left> | ||
<ion-icon name="home"></ion-icon> | ||
Left Icon | ||
</button> | ||
disabled left icon buttons | ||
<p color="primary">Primary paragraph</p> | ||
</button> | ||
|
||
<ion-item color="light"> | ||
<button ion-button item-left icon-right> | ||
Right Icon | ||
<ion-icon name="home"></ion-icon> | ||
</button> | ||
right icon buttons | ||
<button ion-button outline item-right icon-right> | ||
Right Icon | ||
<ion-icon name="star"></ion-icon> | ||
</button> | ||
</ion-item> | ||
|
||
<a ion-item disabled color="danger"> | ||
a ion-item disabled right icon/text button large | ||
<p>Default paragraph</p> | ||
</a> | ||
|
||
</ion-content> |