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

Scroll improvements

Browse Source
This commit is contained in:
Max Lynch
2013-12-03 17:56:35 -06:00
parent e336e4dc54
commit 4155da065c
6 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/css/ionic.css vendored
View File

@@ -1,4 +1,3 @@
@charset "UTF-8";
/*!
* Copyright 2013 Drifty Co.
* http://drifty.com/
@@ -2354,7 +2353,7 @@ body, .ionic-body {
bottom: 44px; }
.has-tabs {
bottom: 44px; }
bottom: 49px; }
.pane {
position: fixed;

1
dist/css/themes/ionic-ios7.css vendored
View File

@@ -1,4 +1,3 @@
@charset "UTF-8";
/*!
* Copyright 2013 Drifty Co.
* http://drifty.com/

2
dist/js/ionic.js vendored
View File

@@ -3424,7 +3424,7 @@ var Scroller;
Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth),
Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight),
this.__content.offsetWidth,
this.__content.offsetHeight+50);
this.__content.offsetHeight+80);
},
/*
---------------------------------------------------------------------------

6
js/ext/angular/test/content.html
View File

@@ -69,7 +69,7 @@
on-refresh="onRefresh()"
on-refresh-opening="onRefreshOpening(amount)"
refresh-complete="refreshComplete"
has-footer="true"
has-tabs="true"
has-header="true"
has-subheader="true"
>
@@ -78,10 +78,6 @@
<li class="list-item" ng-repeat="item in items">asdf{{$index}}</li>
</ul>
</content>
<footer-bar type="bar-assertive">
<h1 class="title">Footer</h1>
</footer-bar>
<nav id="tab-bar" class="tabs tabs-icon-top">
<a class="tab-item" href="#">
<i class="icon ion-game-controller-a"></i>

2
js/views/scrollZyng.js
View File

@@ -590,7 +590,7 @@ var Scroller;
Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth),
Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight),
this.__content.offsetWidth,
this.__content.offsetHeight+50);
this.__content.offsetHeight+80);
},
/*
---------------------------------------------------------------------------

2
scss/_scaffolding.scss
View File

@@ -186,7 +186,7 @@ body, .ionic-body {
// Specify that a content area will have tabs
.has-tabs {
bottom: 44px;
bottom: 49px;
}
// A full screen section with a solid background