From dbe8a64ffc471dd394c9f7a46f08fb73569ada83 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Sat, 16 Jul 2022 12:59:59 +0100 Subject: [PATCH] fix: pass-through to color / unset if no gradient --- external/lang | 2 +- src/components/common/user/UserShort.tsx | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/external/lang b/external/lang index 58a9fb69..1a854216 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 58a9fb697de00f570d445be4d12e3ce4a5e3522e +Subproject commit 1a8542166173445602c0a4a8f821806002fd2fc4 diff --git a/src/components/common/user/UserShort.tsx b/src/components/common/user/UserShort.tsx index b2ca22b2..6f9071de 100644 --- a/src/components/common/user/UserShort.tsx +++ b/src/components/common/user/UserShort.tsx @@ -1,7 +1,7 @@ import { observer } from "mobx-react-lite"; import { useParams } from "react-router-dom"; import { User, API } from "revolt.js"; -import styled from "styled-components/macro"; +import styled, { css } from "styled-components/macro"; import { Ref } from "preact"; import { Text } from "preact-i18n"; @@ -39,10 +39,18 @@ type UsernameProps = Omit< }; const Name = styled.span<{ colour?: string | null }>` - background: ${(props) => props.colour ?? "var(--foreground)"}; - background-clip: text; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; + ${(props) => + props.colour && + (props.colour.includes("gradient") + ? css` + background: ${props.colour}; + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + ` + : css` + color: ${props.colour}; + `)} `; export const Username = observer(