Skip to content

Commit 79387a4

Browse files
ajoslinajoslin
committed
fix(refresher): make refresher css not create gap at end of list
1 parent 2c7ce76 commit 79387a4

File tree

2 files changed

+73
-4
lines changed

2 files changed

+73
-4
lines changed

Diff for: ‎js/ext/angular/test/list-fit.html

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
2+
<html ng-app="ionic">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
6+
7+
<title>Sample UL</title>
8+
9+
<link href="../../../../dist/css/ionic.css" rel="stylesheet">
10+
<script src="../../../../dist/js/ionic.bundle.js"></script>
11+
</head>
12+
13+
<body>
14+
15+
<header-bar title="'Sample UL'" type="bar-positive"></header-bar>
16+
17+
<content has-header="true" scroll="true" ng-controller="ContentCtrl" on-refresh="onRefresh()" has-footer="true" padding="false">
18+
19+
<refresher></refresher>
20+
21+
<ul class="list">
22+
<li class="item">This list should *exactly* fit</li>
23+
<li class="item">between header and footer (no gap),</li>
24+
<li class="item">even with pull-to-refresh.</li>
25+
<li class="item">4</li>
26+
<li class="item">5</li>
27+
<li class="item">6</li>
28+
<li class="item">7</li>
29+
<li class="item">8</li>
30+
<li class="item">9</li>
31+
<li class="item">10</li>
32+
<li class="item">11</li>
33+
<li class="item">12</li>
34+
<li class="item">13</li>
35+
<li class="item">14</li>
36+
<li class="item">15</li>
37+
<li class="item">16</li>
38+
<li class="item">17</li>
39+
<li class="item">18</li>
40+
<li class="item">19</li>
41+
<li class="item">20</li>
42+
<li class="item">21</li>
43+
<li class="item">22</li>
44+
<li class="item">23</li>
45+
<li class="item">24</li>
46+
<li class="item">25</li>
47+
<li class="item">26</li>
48+
</ul>
49+
</content>
50+
51+
<footer-bar type="bar-assertive">
52+
<h1 class="title">Footer!</h1>
53+
</footer-bar>
54+
55+
<script>
56+
function ContentCtrl($scope, $timeout) {
57+
$scope.onRefresh = function() {
58+
$timeout(function() {
59+
$scope.$broadcast('scroll.refreshComplete');
60+
}, 1000);
61+
};
62+
}
63+
</script>
64+
65+
</body>
66+
</html>

Diff for: ‎scss/_scaffolding.scss

+7-4
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ body, .ionic-body {
4646
-webkit-user-drag: none;
4747
}
4848

49-
.content {
49+
.content {
5050
// used for content areas not using the content directive
51-
position: relative
51+
position: relative
5252
}
5353

5454
.scroll-content {
@@ -141,9 +141,12 @@ body, .ionic-body {
141141
// Scroll refresher (for pull to refresh)
142142
.scroll-refresher {
143143
overflow: hidden;
144-
margin-top: -60px;
144+
top: -60px;
145145
height: 60px;
146-
position: relative;
146+
left: 0;
147+
right: 0;
148+
position: absolute;
149+
margin: auto;
147150

148151
.icon-refreshing {
149152
display: none;

0 commit comments

Comments
 (0)