~cytrogen/masto-fe

10b06436d13702aedaa92a8ece84fbfde2829d57 — Eugen Rochko 2 years ago 01b87a1
Fix colors and typography on hashtag bar in web UI (#26666)

M app/javascript/mastodon/components/hashtag_bar.tsx => app/javascript/mastodon/components/hashtag_bar.tsx +3 -3
@@ 10,8 10,8 @@ import { groupBy, minBy } from 'lodash';

import { getStatusContent } from './status_content';

// About two lines on desktop
const VISIBLE_HASHTAGS = 7;
// Fit on a single line on desktop
const VISIBLE_HASHTAGS = 3;

// Those types are not correct, they need to be replaced once this part of the state is typed
export type TagLike = Record<{ name: string }>;


@@ 210,7 210,7 @@ const HashtagBar: React.FC<{

  const revealedHashtags = expanded
    ? hashtags
    : hashtags.slice(0, VISIBLE_HASHTAGS - 1);
    : hashtags.slice(0, VISIBLE_HASHTAGS);

  return (
    <div className='hashtag-bar'>

M app/javascript/styles/mastodon/components.scss => app/javascript/styles/mastodon/components.scss +12 -7
@@ 9308,19 9308,24 @@ noscript {
  display: flex;
  flex-wrap: wrap;
  font-size: 14px;
  line-height: 18px;
  gap: 4px;
  color: $darker-text-color;

  a {
    display: inline-flex;
    color: $dark-text-color;
    color: inherit;
    text-decoration: none;

    &:hover {
      text-decoration: none;

      span {
        text-decoration: underline;
      }
    &:hover span {
      text-decoration: underline;
    }
  }

  .link-button {
    color: inherit;
    font-size: inherit;
    line-height: inherit;
    padding: 0;
  }
}