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

button updates

Browse Source
This commit is contained in:
Adam Bradley
2015-09-03 14:15:07 -05:00
parent e99764d7c9
commit 17e1360cda
13 changed files with 92 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,15 +10,15 @@
<ion-toolbar>
<ion-nav-items primary>
<button>
<icon settings></icon>
<icon ios=contact></icon>
</button>
<button>
<icon heart></icon>
<icon search></icon>
</button>
</ion-nav-items>
<ion-nav-items secondary>
<button>
<icon more-horizontal></icon>
<icon more></icon>
</button>
</ion-nav-items>
<ion-title>Defaults</ion-title>
@@ -28,15 +28,15 @@
<ion-toolbar>
<ion-nav-items primary>
<button class="hover">
<icon settings></icon>
<icon ios=contact></icon>
</button>
<button class="hover">
<icon heart></icon>
<icon search></icon>
</button>
</ion-nav-items>
<ion-nav-items secondary>
<button class="hover">
<icon more-horizontal></icon>
<icon more></icon>
</button>
</ion-nav-items>
<ion-title>Defaults.hover</ion-title>
@@ -46,15 +46,15 @@
<ion-toolbar>
<ion-nav-items primary>
<button class="activated">
<icon settings></icon>
<icon ios=contact></icon>
</button>
<button class="activated">
<icon heart></icon>
<icon search></icon>
</button>
</ion-nav-items>
<ion-nav-items secondary>
<button class="activated">
<icon more-horizontal></icon>
<icon more></icon>
</button>
</ion-nav-items>
<ion-title>Defaults.activated</ion-title>
@@ -64,10 +64,10 @@
<ion-toolbar>
<ion-nav-items primary>
<button clear>
<icon flag></icon>
<icon contact></icon>
</button>
<button clear>
<icon settings></icon>
<icon contact></icon>
Clear
</button>
</ion-nav-items>
@@ -84,10 +84,10 @@
<ion-toolbar>
<ion-nav-items primary>
<button clear class="hover">
<icon flag></icon>
<icon contact></icon>
</button>
<button clear class="hover">
<icon settings></icon>
<icon contact></icon>
Clear
</button>
</ion-nav-items>
@@ -104,10 +104,10 @@
<ion-toolbar>
<ion-nav-items primary>
<button clear class="activated">
<icon flag></icon>
<icon contact></icon>
</button>
<button clear class="activated">
<icon settings></icon>
<icon contact></icon>
Clear
</button>
</ion-nav-items>
@@ -124,7 +124,7 @@
<ion-toolbar>
<ion-nav-items primary>
<button outline>
<icon settings></icon>
<icon contact></icon>
</button>
<button outline>
<icon star></icon>
@@ -133,7 +133,7 @@
</ion-nav-items>
<ion-nav-items secondary>
<button secondary outline>
<icon flag></icon>
<icon contact></icon>
</button>
</ion-nav-items>
<ion-title>Outline</ion-title>
@@ -143,7 +143,7 @@
<ion-toolbar>
<ion-nav-items primary>
<button outline class="hover">
<icon settings></icon>
<icon contact></icon>
</button primary>
<button outline class="hover">
<icon star></icon>
@@ -152,7 +152,7 @@
</ion-nav-items>
<ion-nav-items secondary>
<button secondary outline class="hover">
<icon flag></icon>
<icon contact></icon>
</button>
</ion-nav-items>
<ion-title>Outline.hover</ion-title>
@@ -162,7 +162,7 @@
<ion-toolbar>
<ion-nav-items primary>
<button outline class="activated">
<icon settings></icon>
<icon contact></icon>
</button>
<button outline class="activated">
<icon star></icon>
@@ -171,7 +171,7 @@
</ion-nav-items>
<ion-nav-items secondary>
<button secondary outline class="activated">
<icon flag></icon>
<icon contact></icon>
</button>
</ion-nav-items>
<ion-title>Outline.activated</ion-title>
@@ -226,7 +226,7 @@
<ion-toolbar>
<ion-nav-items primary>
<button>
<icon settings></icon>
<icon contact></icon>
Clear
</button>
</ion-nav-items>