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

Merge remote-tracking branch 'origin/master' into WIP-api-demos

Browse Source
This commit is contained in:
Drew Rygh
2015-12-16 11:13:03 -06:00
parent adf62fdc41 364f9e12ae
commit 068f3ceb29
185 changed files with 2645 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
demos/component-docs/inputs/switch/template.html
View File

@ -10,53 +10,53 @@
<ion-content>
<ion-list>
<ion-switch value="foo" checked="true">
<ion-toggle value="foo" checked="true">
Frodo Baggins
</ion-switch>
</ion-toggle>
<ion-switch energized>
<ion-toggle energized>
Sam
</ion-switch>
</ion-toggle>
<ion-switch danger checked="true">
<ion-toggle danger checked="true">
Éowyn
</ion-switch>
</ion-toggle>
<ion-switch royal checked="true">
<ion-toggle royal checked="true">
Legolas
</ion-switch>
</ion-toggle>
<ion-switch danger>
<ion-toggle danger>
Gimli
</ion-switch>
</ion-toggle>
<ion-switch dark checked="true">
<ion-toggle dark checked="true">
Saruman
</ion-switch>
</ion-toggle>
<ion-switch energized checked="true">
<ion-toggle energized checked="true">
Gandalf
</ion-switch>
</ion-toggle>
<ion-switch royal>
<ion-toggle royal>
Arwen
</ion-switch>
</ion-toggle>
<ion-switch secondary checked="true">
<ion-toggle secondary checked="true">
Treebeard
</ion-switch>
</ion-toggle>
<ion-switch royal>
<ion-toggle royal>
Boromir
</ion-switch>
</ion-toggle>
<ion-switch dark checked="true">
<ion-toggle dark checked="true">
Gollum
</ion-switch>
</ion-toggle>
<ion-switch energized>
<ion-toggle energized>
Galadriel
</ion-switch>
</ion-toggle>
</ion-list>

8
demos/component-docs/lists/icon/template.html
View File

@ -18,10 +18,10 @@
</ion-note>
</ion-item>
<ion-switch checked="false">
<ion-toggle checked="false">
<icon body item-left></icon>
Muggle Studies
</ion-switch>
</ion-toggle>
<ion-item>
<icon leaf item-left></icon>
@ -54,10 +54,10 @@
<ion-note item-right>Crucio!</ion-note>
</ion-item>
<ion-switch checked="true">
<ion-toggle checked="true">
<icon brush item-left></icon>
Quidditch Practice
</ion-switch>
</ion-toggle>
<ion-item>
<icon wine item-left></icon>