Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix home regeneration (#6251)

Browse source 
* Fix regeneration marker not being removed after completion

* Return HTTP 206 from /api/v1/timelines/home if regeneration in progress
Prioritize RegenerationWorker by putting it into default queue

* Display loading indicator and poll home timeline while it regenerates

* Add graphic to regeneration message

* Make "not found" indicator consistent with home regeneration
This commit is contained in:
Eugen Rochko 2018-01-17 23:56:03 +01:00 • committed by GitHub
parent 59797ee233
commit 7badad7797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 165 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

43
app/javascript/styles/mastodon/components.scss
View file

@ -2303,7 +2303,7 @@
}
}
.missing-indicator {
.regeneration-indicator {
text-align: center;
font-size: 16px;
font-weight: 500;
@ -2314,11 +2314,46 @@
flex: 1 1 auto;
align-items: center;
justify-content: center;
padding: 20px;
& > div {
background: url('../images/mastodon-not-found.png') no-repeat center -50px;
padding-top: 210px;
width: 100%;
background: transparent;
padding-top: 0;
}
&__figure {
background: url('../images/elephant_ui_working.svg') no-repeat center 0;
width: 100%;
height: 160px;
background-size: contain;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
&.missing-indicator {
padding-top: 20px + 48px;
.regeneration-indicator__figure {
background-image: url('../images/elephant_ui_disappointed.svg');
}
}
&__label {
margin-top: 200px;
strong {
display: block;
margin-bottom: 10px;
color: lighten($ui-base-color, 34%);
}
span {
font-size: 15px;
font-weight: 400;
}
}
}
@ -2749,7 +2784,6 @@
@keyframes heartbeat {
from {
transform: scale(1);
transform-origin: center center;
animation-timing-function: ease-out;
}
@ -2775,6 +2809,7 @@
}
.pulse-loading {
transform-origin: center center;
animation: heartbeat 1.5s ease-in-out infinite both;
}