fix(channel): last update before master merge

This commit is contained in:
trashtemp
2021-12-29 16:39:35 +01:00
parent cc531705b4
commit 086ab7b3bc
7 changed files with 139 additions and 88 deletions

View File

@@ -26,9 +26,6 @@ const ServerBanner = styled.div<Props>`
display: flex;
flex-direction: column;
justify-content: end;
/*background-position: center;
background-repeat: no-repeat;
background-size: cover;*/
background-size: cover !important;
background-position: center center !important;

View File

@@ -49,7 +49,7 @@ export default observer(
}
}}>
<div>
New messages since{" "}
<Text id="app.main.channel.misc.new_messages" />{" "}
{dayjs(decodeTime(last_id)).fromNow()}
</div>
<div>

View File

@@ -1,3 +1,4 @@
import { Group } from "@styled-icons/boxicons-solid";
import { autorun } from "mobx";
import { observer } from "mobx-react-lite";
import { useHistory } from "react-router-dom";
@@ -47,7 +48,7 @@ const EmbedInviteBase = styled.div`
const EmbedInviteDetails = styled.div`
flex-grow: 1;
padding-left: 12px;
padding-inline-start: 12px;
${() =>
isTouchscreenDevice &&
css`
@@ -63,7 +64,14 @@ const EmbedInviteName = styled.div`
`;
const EmbedInviteMemberCount = styled.div`
display: flex;
align-items: center;
gap: 2px;
font-size: 0.8em;
> svg {
color: var(--secondary-foreground);
}
`;
type Props = {
@@ -119,6 +127,7 @@ export function EmbedInvite({ code }: Props) {
<EmbedInviteDetails>
<EmbedInviteName>{invite.server_name}</EmbedInviteName>
<EmbedInviteMemberCount>
<Group size={12} />
{invite.member_count.toLocaleString()}{" "}
{invite.member_count === 1 ? "member" : "members"}
</EmbedInviteMemberCount>

View File

@@ -8,6 +8,13 @@ export default styled.div`
user-select: none;
flex-direction: row;
align-items: stretch;
/*background: var(--background);*/
background-color: rgba(
var(--background-rgb),
max(var(--min-opacity), 0.75)
);
backdrop-filter: blur(20px);
/*> * > ::-webkit-scrollbar-thumb {
width: 4px;