diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2022-11-27 15:49:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 23:49:32 +0100 |
| commit | cec1e902e006730f68bde0a4334e5b819a12a475 (patch) | |
| tree | 90285814932de1d60fd615a9b6d70206533f2adb /app/javascript | |
| parent | 3ffaa966b0ba11b318e9a93b41854aa765d2ed5c (diff) | |
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.
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/getting_started/components/trends.js | 7 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/getting_started/components/trends.js b/app/javascript/mastodon/features/getting_started/components/trends.js index 71c7c458d..8dcdb4f61 100644 --- a/app/javascript/mastodon/features/getting_started/components/trends.js +++ b/app/javascript/mastodon/features/getting_started/components/trends.js @@ -4,6 +4,7 @@ import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router-dom'; export default class Trends extends ImmutablePureComponent { @@ -36,7 +37,11 @@ export default class Trends extends ImmutablePureComponent { return ( <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} />)} </div> diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 119bbe8e6..45b1ac501 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3139,12 +3139,16 @@ $ui-header-height: 55px; margin-top: 10px; h4 { + border-bottom: 1px solid lighten($ui-base-color, 8%); + padding: 10px; font-size: 12px; text-transform: uppercase; - color: $darker-text-color; - padding: 10px; 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) { |