nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6070 from AugierLe42e/infinite-scroll-fix

Browse source 
Fixing infinite scroll and notif dropodown loaders
This commit is contained in:
Steffen van Bergerem 2015-06-07 11:11:34 +02:00
commit dbd8a91d94
4 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/_mixins.scss
View file

@ -62,7 +62,7 @@ $default-border-radius: 3px;
size : 60px 60px; size : 60px 60px;
} }
border-radius: 70px 10px 10px 70px; border-radius: 40px 10px 10px 40px;
box-shadow: 0 0 32px rgba(255,255,255,.5); box-shadow: 0 0 32px rgba(255,255,255,.5);
position : absolute; position : absolute;
@ -70,7 +70,7 @@ $default-border-radius: 3px;
left : 10%; left : 10%;
right : 10%; right : 10%;
height: 60px; height: 80px;
margin-top: -40px; margin-top: -40px;
padding: 10px 7px 10px 80px; padding: 10px 7px 10px 80px;
overflow: hidden; overflow: hidden;

2
app/assets/stylesheets/header.scss
View file

@ -156,8 +156,8 @@ body > header {
.ajax_loader { .ajax_loader {
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
text-align: center;
padding: 15px; padding: 15px;
img { height: 21px; }
} }
.notifications{ .notifications{
overflow: hidden; overflow: hidden;

18
app/assets/stylesheets/new_styles/_spinner.scss
View file

@ -1,13 +1,3 @@
@keyframes fade-in {
0% { opacity: 0; }
100% { opacity: 1; }
}
@keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}
#paginate, #infscr-loading { #paginate, #infscr-loading {
margin-top: 10px; margin-top: 10px;
padding: 8px 0; padding: 8px 0;
@ -18,14 +8,10 @@
} }
.loader { .loader {
mask-image: image-url('ajax-loader2.gif');
animation: spin 1s infinite ease-in-out, fade-in 0.2s ease-in;
background-image : image-url("ajax-loader2.gif"); background-image : image-url("ajax-loader2.gif");
display: inline-block; display: inline-block;
width : 14px; width : 32px;
height: 14px; height: 32px;
&.hidden{ &.hidden{
display : none; display : none;

2
app/assets/templates/header_tpl.jst.hbs
View file

@ -56,7 +56,7 @@
<div class="notifications"> <div class="notifications">
<div class="ajax_loader"> <div class="ajax_loader">
<img alt="Ajax-loader" src="{{imageUrl "ajax-loader2.gif"}}"> <img class="img-responsive center-block" alt="Ajax-loader" src="{{imageUrl "ajax-loader2.gif"}}">
</div> </div>
</div> </div>
<div class="view_all"> <div class="view_all">