mirror of
https://github.com/revoltchat/revite.git
synced 2024-11-13 18:59:22 -05:00
Merge branch 'master' of https://gitlab.insrt.uk/revolt/revite
This commit is contained in:
commit
252fec804d
3 changed files with 40 additions and 6 deletions
2
external/lang
vendored
2
external/lang
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit de2b94c8d8615b732cbbec3679041e73fd3c7640
|
Subproject commit 2054052c791ff2396dcbde68ae257fa13a93ab6c
|
|
@ -29,10 +29,11 @@ export const ReplyBase = styled.div<{
|
||||||
}>`
|
}>`
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
display: flex;
|
display: flex;
|
||||||
margin: 0 30px;
|
margin-inline-start: 30px;
|
||||||
|
margin-inline-end: 12px;
|
||||||
|
margin-bottom: 4px;
|
||||||
font-size: 0.8em;
|
font-size: 0.8em;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
margin-bottom: 4px;
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
color: var(--secondary-foreground);
|
color: var(--secondary-foreground);
|
||||||
|
|
||||||
|
@ -42,12 +43,45 @@ export const ReplyBase = styled.div<{
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.user {
|
||||||
|
display: flex;
|
||||||
|
gap: 4px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
font-weight: 600;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
span {
|
||||||
|
cursor: pointer;
|
||||||
|
&:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*&::before {
|
||||||
|
position:relative;
|
||||||
|
width: 50px;
|
||||||
|
height: 2px;
|
||||||
|
background: red;
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
display: flex;
|
display: flex;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
transition: filter 1s ease-in-out;
|
||||||
|
transition: transform ease-in-out .1s;
|
||||||
|
filter: brightness(1);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
filter: brightness(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
transform: translateY(1px);
|
||||||
|
}
|
||||||
|
|
||||||
> * {
|
> * {
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
@ -120,7 +154,7 @@ export function MessageReply({ index, channel, id }: Props) {
|
||||||
{message.author === SYSTEM_USER_ID ? (
|
{message.author === SYSTEM_USER_ID ? (
|
||||||
<SystemMessage message={message} hideInfo />
|
<SystemMessage message={message} hideInfo />
|
||||||
) : <>
|
) : <>
|
||||||
<UserShort user={user} size={16} />
|
<div className="user"><UserShort user={user} size={16} /></div>
|
||||||
<div className="content" onClick={() => {
|
<div className="content" onClick={() => {
|
||||||
let obj = ctx.client.channels.get(channel);
|
let obj = ctx.client.channels.get(channel);
|
||||||
if (obj?.channel_type === 'TextChannel') {
|
if (obj?.channel_type === 'TextChannel') {
|
||||||
|
|
|
@ -31,9 +31,9 @@ export function Component(props: Props) {
|
||||||
: "EXPERIMENTS_DISABLE",
|
: "EXPERIMENTS_DISABLE",
|
||||||
key,
|
key,
|
||||||
})
|
})
|
||||||
}>
|
}
|
||||||
|
description={ EXPERIMENTS[key].description }>
|
||||||
{ EXPERIMENTS[key].title }
|
{ EXPERIMENTS[key].title }
|
||||||
<p>{ EXPERIMENTS[key].description }</p>
|
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
))}
|
))}
|
||||||
{AVAILABLE_EXPERIMENTS.length === 0 && (
|
{AVAILABLE_EXPERIMENTS.length === 0 && (
|
||||||
|
|
Loading…
Reference in a new issue