mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-19 16:07:08 +00:00
Change animation on feed generation screen in web UI (#33311)
This commit is contained in:
parent
74478888ff
commit
3cf6681736
|
@ -1,18 +0,0 @@
|
||||||
import { FormattedMessage } from 'react-intl';
|
|
||||||
|
|
||||||
import illustration from '@/images/elephant_ui_working.svg';
|
|
||||||
|
|
||||||
const RegenerationIndicator = () => (
|
|
||||||
<div className='regeneration-indicator'>
|
|
||||||
<div className='regeneration-indicator__figure'>
|
|
||||||
<img src={illustration} alt='' />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className='regeneration-indicator__label'>
|
|
||||||
<FormattedMessage id='regeneration_indicator.label' tagName='strong' defaultMessage='Loading…' />
|
|
||||||
<FormattedMessage id='regeneration_indicator.sublabel' defaultMessage='Your home feed is being prepared!' />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default RegenerationIndicator;
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
|
||||||
|
import { GIF } from './gif';
|
||||||
|
|
||||||
|
export const RegenerationIndicator: React.FC = () => (
|
||||||
|
<div className='regeneration-indicator'>
|
||||||
|
<GIF
|
||||||
|
src='/loading.gif'
|
||||||
|
staticSrc='/loading.png'
|
||||||
|
className='regeneration-indicator__figure'
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div className='regeneration-indicator__label'>
|
||||||
|
<strong>
|
||||||
|
<FormattedMessage
|
||||||
|
id='regeneration_indicator.preparing_your_home_feed'
|
||||||
|
defaultMessage='Preparing your home feed…'
|
||||||
|
/>
|
||||||
|
</strong>
|
||||||
|
<FormattedMessage
|
||||||
|
id='regeneration_indicator.please_stand_by'
|
||||||
|
defaultMessage='Please stand by.'
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
|
@ -6,7 +6,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import { debounce } from 'lodash';
|
import { debounce } from 'lodash';
|
||||||
|
|
||||||
import { TIMELINE_GAP, TIMELINE_SUGGESTIONS } from 'mastodon/actions/timelines';
|
import { TIMELINE_GAP, TIMELINE_SUGGESTIONS } from 'mastodon/actions/timelines';
|
||||||
import RegenerationIndicator from 'mastodon/components/regeneration_indicator';
|
import { RegenerationIndicator } from 'mastodon/components/regeneration_indicator';
|
||||||
import { InlineFollowSuggestions } from 'mastodon/features/home_timeline/components/inline_follow_suggestions';
|
import { InlineFollowSuggestions } from 'mastodon/features/home_timeline/components/inline_follow_suggestions';
|
||||||
|
|
||||||
import StatusContainer from '../containers/status_container';
|
import StatusContainer from '../containers/status_container';
|
||||||
|
|
|
@ -697,8 +697,8 @@
|
||||||
"privacy_policy.title": "Privacy Policy",
|
"privacy_policy.title": "Privacy Policy",
|
||||||
"recommended": "Recommended",
|
"recommended": "Recommended",
|
||||||
"refresh": "Refresh",
|
"refresh": "Refresh",
|
||||||
"regeneration_indicator.label": "Loading…",
|
"regeneration_indicator.please_stand_by": "Please stand by.",
|
||||||
"regeneration_indicator.sublabel": "Your home feed is being prepared!",
|
"regeneration_indicator.preparing_your_home_feed": "Preparing your home feed…",
|
||||||
"relative_time.days": "{number}d",
|
"relative_time.days": "{number}d",
|
||||||
"relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
|
"relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
|
||||||
"relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
|
"relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
|
||||||
|
|
|
@ -4088,10 +4088,7 @@ a.status-card {
|
||||||
}
|
}
|
||||||
|
|
||||||
.regeneration-indicator {
|
.regeneration-indicator {
|
||||||
text-align: center;
|
color: $darker-text-color;
|
||||||
font-size: 16px;
|
|
||||||
font-weight: 500;
|
|
||||||
color: $dark-text-color;
|
|
||||||
border: 1px solid var(--background-border-color);
|
border: 1px solid var(--background-border-color);
|
||||||
border-top: 0;
|
border-top: 0;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
@ -4103,31 +4100,26 @@ a.status-card {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
|
|
||||||
&__figure {
|
&__figure {
|
||||||
&,
|
display: block;
|
||||||
img {
|
width: 100%;
|
||||||
display: block;
|
height: auto;
|
||||||
width: auto;
|
max-width: 350px;
|
||||||
height: 160px;
|
margin-top: -50px;
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&--without-header {
|
|
||||||
padding-top: 20px + 48px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__label {
|
&__label {
|
||||||
margin-top: 30px;
|
text-align: center;
|
||||||
|
font-size: 16px;
|
||||||
|
|
||||||
strong {
|
strong {
|
||||||
|
font-weight: 500;
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
color: $dark-text-color;
|
color: $darker-text-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
span {
|
span {
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
font-weight: 400;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
BIN
public/loading.gif
Executable file
BIN
public/loading.gif
Executable file
Binary file not shown.
After Width: | Height: | Size: 288 KiB |
BIN
public/loading.png
Executable file
BIN
public/loading.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 73 KiB |
Loading…
Reference in a new issue