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 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

4
ionic/components/scroll/test/basic/main.html
View File

@ -1,4 +1,4 @@
<ion-view nav-title="Pull to refresh">
<!-- <ion-view nav-title="Pull to refresh"> -->
<ion-toolbar><ion-title>Scroll</ion-title></ion-toolbar>
<ion-content>
@ -20,7 +20,7 @@
</ion-content>
</ion-view>
<!-- </ion-view> -->
<style>
f { display: block; height: 400px; width: 100%; background-color: #387ef5; margin-bottom: 15px; }
#counter {

4
ionic/components/scroll/test/pull-to-refresh/main.html
View File

@ -1,4 +1,4 @@
<ion-view nav-title="Pull to refresh">
<!-- <ion-view nav-title="Pull to refresh"> -->
<ion-toolbar><ion-title>Pull To Refresh</ion-title></ion-toolbar>
<ion-content>
@ -13,7 +13,7 @@
<f></f>
</ion-content>
</ion-view>
<!-- </ion-view> -->
<style>
f { display: block; height: 400px; width: 100%; background-color: #387ef5; margin-bottom: 15px; }
#counter {