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

Merge branch 'master' into alpha38

Browse Source 
Conflicts:
	ionic/components/popup/popup.ts
This commit is contained in:
Adam Bradley
2015-10-05 16:43:30 -05:00
parent 5c17f82e7f 2bac3a9ef8
commit 974a70cf0e
15 changed files with 353 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ionic/components/tabs/test/tab-bar-bottom/main.html
View File

@ -1,20 +1,16 @@
<nav-bar></nav-bar>
<ion-tabs tab-bar-placement="bottom">
<ion-tab tab-title="Tab 1">
<ion-view nav-title="Tab 1">
<ion-content padding>
Tab 1 Content
</ion-content>
</ion-view>
<ion-content padding>
Tab 1 Content
</ion-content>
</ion-tab>
<ion-tab tab-title="Tab 2">
<ion-view nav-title="Tab 2">
<ion-content padding>
Tab 2 Content
</ion-content>
</ion-view>
<ion-content padding>
Tab 2 Content
</ion-content>
</ion-tab>
</ion-tabs>