cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-10 01:03:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #90 from ryanalexander/patch-3

Browse source
This commit is contained in:
Paul Makles 2021-08-17 15:33:47 +01:00 committed by GitHub
commit ca6bdd332e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/components/navigation/left/ServerListSidebar.tsx
View file

@ -5,9 +5,8 @@ import { Link, useHistory, useLocation, useParams } from "react-router-dom";
import { RelationshipStatus } from "revolt-api/types/Users"; import { RelationshipStatus } from "revolt-api/types/Users";
import styled, { css } from "styled-components"; import styled, { css } from "styled-components";
import { Text } from "preact-i18n";
import { attachContextMenu } from "preact-context-menu"; import { attachContextMenu } from "preact-context-menu";
import { Text } from "preact-i18n";
import ConditionalLink from "../../../lib/ConditionalLink"; import ConditionalLink from "../../../lib/ConditionalLink";
import PaintCounter from "../../../lib/PaintCounter"; import PaintCounter from "../../../lib/PaintCounter";
@ -58,7 +57,17 @@ function Icon({
{unread === "mention" && ( {unread === "mention" && (
<> <>
<circle cx="27" cy="5" r="5" fill={"var(--error)"} /> <circle cx="27" cy="5" r="5" fill={"var(--error)"} />
<text x="27" y="5" r="5" fill={"white"} fontSize={"7.5"} alignmentBaseline={"middle"}>{count < 9 ? count : "9+"}</text> <text
x="27"
y="5"
r="5"
fill={"white"}
style={"text-align:center;"}
text-anchor="middle"
fontSize={"7.5"}
alignmentBaseline={"middle"}>
{count < 10 ? count : "9+"}
</text>
</> </>
)} )}
</svg> </svg>
@ -268,7 +277,10 @@ export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
homeActive && history.push("/settings") homeActive && history.push("/settings")
}> }>
<UserHover user={client.user}> <UserHover user={client.user}>
<Icon size={42} unread={homeUnread} count={alertCount}> <Icon
size={42}
unread={homeUnread}
count={alertCount}>
<UserIcon <UserIcon
target={client.user} target={client.user}
size={32} size={32}
@ -302,7 +314,10 @@ export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
<Tooltip <Tooltip
content={entry.server.name} content={entry.server.name}
placement="right"> placement="right">
<Icon size={42} unread={entry.unread} count={entry.alertCount}> <Icon
size={42}
unread={entry.unread}
count={entry.alertCount}>
<ServerIcon <ServerIcon
size={32} size={32}
target={entry.server} target={entry.server}