Skip to content

Commit

Permalink
add loading gif
Browse files Browse the repository at this point in the history
  • Loading branch information
StrickYan committed Mar 24, 2017
1 parent 4b939b8 commit 544183f
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 1 deletion.
1 change: 1 addition & 0 deletions Application/Home/View/Moments/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
</div>
</div>
</volist>
<div id="loading"><img src="__PUBLIC__/Home/img/default/loading.gif"></div>
<div id="footer" data-role="footer">
<div class="info-flow" >
<div class="footer-left">
Expand Down
9 changes: 9 additions & 0 deletions Public/Home/css/moments.css
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,15 @@ hr {
}


#loading {
text-align: center;
position: relative;
padding: 10px 10px 5px 10px;
border-bottom: 1px solid #eee;
background-color: white;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}

/*底部栏*/

#footer {
Expand Down
5 changes: 5 additions & 0 deletions Public/Home/css/pc.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,9 @@ body {

#location {
height: 50px;
}

#loading {
border-radius: 5px;
box-shadow: 0 0 15px 5px rgba(0, 0, 0, 0.4);
}
Binary file removed Public/Home/img/default/icon.bak.png
Binary file not shown.
Binary file modified Public/Home/img/default/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Public/Home/img/default/loading.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Public/Home/js/moments.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function loadNextPage(page) {
result += "</div>";
result += "</div>";
}
$('#footer').before(result).fadeOut().fadeIn(pc_speed);
$('#loading').before(result).fadeOut().fadeIn(pc_speed);
$(".info-flow-right-button .button-img").each(function() {
divPop($(this));
});
Expand Down

0 comments on commit 544183f

Please sign in to comment.