zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Make the 'Trending now' header a link to Explore. (#21759) 

This keeps the same design that exists currently, but makes "Trending
now" into a link to the Hashtags section of "Explore".

Resolves #21758.
This commit is contained in:
Connor Shea 2022-11-27 15:49:32 -07:00 committed by GitHub
parent 3ffaa966b0
commit cec1e902e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag'; import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { Link } from 'react-router-dom';
export default class Trends extends ImmutablePureComponent { export default class Trends extends ImmutablePureComponent {
@ -36,7 +37,11 @@ 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> <h4>
<Link to={'/explore/tags'}>
<FormattedMessage id='trends.trending_now' defaultMessage='Trending now' />
</Link>
</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>

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

@ -3139,12 +3139,16 @@ $ui-header-height: 55px;
margin-top: 10px; margin-top: 10px;
h4 { h4 {
border-bottom: 1px solid lighten($ui-base-color, 8%);
padding: 10px;
font-size: 12px; font-size: 12px;
text-transform: uppercase; text-transform: uppercase;
color: $darker-text-color;
padding: 10px;
font-weight: 500; font-weight: 500;
border-bottom: 1px solid lighten($ui-base-color, 8%);
a {
color: $darker-text-color;
text-decoration: none;
}
} }
@media screen and (max-height: 810px) { @media screen and (max-height: 810px) {