From cec1e902e006730f68bde0a4334e5b819a12a475 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Sun, 27 Nov 2022 15:49:32 -0700 Subject: [PATCH] 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. --- .../features/getting_started/components/trends.js | 7 ++++++- 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 (
-

+

+ + + +

{trends.take(3).map(hashtag => )}
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) {