javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

toolbar button updates

Browse Source
This commit is contained in:
Adam Bradley
2015-12-07 11:18:00 -06:00
parent 3f79316d81
commit 8b693ce836
45 changed files with 329 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
ionic/components/toolbar/test/scenarios/main.html
View File

@@ -5,43 +5,43 @@
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button>
<icon ios=contact></icon>
</button>
<button>
<icon search></icon>
</button>
</ion-nav-items>
<ion-nav-items secondary>
</ion-buttons>
<ion-buttons end>
<button>
<icon more></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Defaults</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button class="activated">
<icon ios="contact"></icon>
</button>
<button class="activated">
<icon search></icon>
</button>
</ion-nav-items>
<ion-nav-items secondary>
</ion-buttons>
<ion-buttons end>
<button class="activated">
<icon more></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Defaults.activated</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button clear>
<icon contact></icon>
</button>
@@ -49,19 +49,19 @@
<icon contact></icon>
Clear
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Clear</ion-title>
<ion-nav-items secondary>
<ion-buttons end>
<button clear secondary>
Help
<icon help-circle></icon>
</button>
</ion-nav-items>
</ion-buttons>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button clear class="activated">
<icon contact></icon>
</button>
@@ -69,19 +69,19 @@
<icon contact></icon>
Clear
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Clear</ion-title>
<ion-nav-items secondary>
<ion-buttons end>
<button clear secondary class="activated">
Help
<icon help-circle></icon>
</button>
</ion-nav-items>
</ion-buttons>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button outline>
<icon contact></icon>
</button>
@@ -89,18 +89,18 @@
<icon star></icon>
Star
</button>
</ion-nav-items>
<ion-nav-items secondary>
</ion-buttons>
<ion-buttons end>
<button secondary outline>
<icon contact></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Outline</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button outline class="activated">
<icon contact></icon>
</button>
@@ -108,94 +108,94 @@
<icon star></icon>
Star
</button>
</ion-nav-items>
<ion-nav-items secondary>
</ion-buttons>
<ion-buttons end>
<button secondary outline class="activated">
<icon contact></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Outline.activated</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button>
Btn
</button>
</ion-nav-items>
<ion-nav-items secondary>
</ion-buttons>
<ion-buttons end>
<button secondary>
Btn
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>ColorAttr</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button class="activated">
Btn
</button>
</ion-nav-items>
<ion-nav-items secondary>
</ion-buttons>
<ion-buttons end>
<button secondary class="activated">
Btn
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>ColorAttr.activated</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items primary>
<ion-buttons start>
<button>
<icon contact></icon>
Clear
</button>
</ion-nav-items>
<ion-nav-items secondary>
</ion-buttons>
<ion-buttons end>
<button>
Edit
<icon create></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Icon/Color Attr</ion-title>
</ion-toolbar>
<ion-toolbar>
<a menu-toggle>
<button menu-toggle>
<icon menu></icon>
</a>
<ion-nav-items primary>
</button>
<ion-buttons start>
<button>
<icon star></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Left side menu toggle</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items secondary>
<ion-buttons end>
<button #button1 (click)="buttonClick(button1)">
<icon star></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-title>Right side menu toggle</ion-title>
<a menu-toggle secondary>
<button menu-toggle right>
<icon menu></icon>
</a>
</button>
</ion-toolbar>
<ion-toolbar>
<ion-nav-items secondary>
<ion-buttons end>
<button #button2 (click)="buttonClick(button2)">
<icon search></icon>
</button>
</ion-nav-items>
</ion-buttons>
<ion-segment secondary>
<ion-segment-button>
Something