OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Add header to trends section and change refresh rate to 15 minutes (#11641)

pull/11645/head
Eugen Rochko 2019-08-23 05:05:21 +02:00 committed by GitHub
parent 282ea17078
commit 4ef8d8b77c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/features/getting_started/components/trends.js
View File

@ -3,6 +3,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import Hashtag from 'mastodon/components/hashtag'; import Hashtag from 'mastodon/components/hashtag';
import { FormattedMessage } from 'react-intl';
export default class Trends extends ImmutablePureComponent { export default class Trends extends ImmutablePureComponent {
@ -17,7 +18,7 @@ export default class Trends extends ImmutablePureComponent {
componentDidMount () { componentDidMount () {
this.props.fetchTrends(); this.props.fetchTrends();
this.refreshInterval = setInterval(() => this.props.fetchTrends(), 3600000); this.refreshInterval = setInterval(() => this.props.fetchTrends(), 900 * 1000);
} }
componentWillUnmount () { componentWillUnmount () {
@ -35,6 +36,8 @@ export default class Trends extends ImmutablePureComponent {
return ( return (
<div className='getting-started__trends'> <div className='getting-started__trends'>
<h4><FormattedMessage id='trends.trending_now' defaultMessage='Trending now' /></h4>
{trends.take(3).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)} {trends.take(3).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
</div> </div>
); );

9
app/javascript/styles/mastodon/components.scss
View File

@ -2765,6 +2765,15 @@ a.account__display-name {
animation: fade 150ms linear; animation: fade 150ms linear;
margin-top: 10px; margin-top: 10px;
h4 {
font-size: 12px;
text-transform: uppercase;
color: $darker-text-color;
padding: 10px;
font-weight: 500;
border-bottom: 1px solid lighten($ui-base-color, 8%);
}
@media screen and (max-height: 810px) { @media screen and (max-height: 810px) {
.trends__item:nth-child(3) { .trends__item:nth-child(3) {
display: none; display: none;