1
0
Fork 1
mirror of https://github.com/Vendicated/Vencord.git synced 2025-01-25 00:36:23 +00:00

Merge branch 'dev' into immediate-finds

This commit is contained in:
Nuckyz 2024-09-21 09:27:06 -03:00
commit 4dd26270ae
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
2 changed files with 4 additions and 14 deletions

View file

@ -7,7 +7,7 @@
import { classNameFactory } from "@api/Styles";
import ErrorBoundary from "@components/ErrorBoundary";
import { classes } from "@utils/misc";
import { filters, findByCode, findComponentByCode, findProp, findStore, mapMangledModule } from "@webpack";
import { filters, findByCode, findByProps, findComponentByCode, findProp, findStore, mapMangledModule } from "@webpack";
import { ChannelRouter, ChannelStore, GuildStore, IconUtils, match, P, PermissionsBits, PermissionStore, React, showToast, Text, Toasts, Tooltip, useMemo, UserStore, useStateFromStores } from "@webpack/common";
import { Channel } from "discord-types/general";
@ -24,6 +24,8 @@ const UserSummaryItem = findComponentByCode("defaultRenderUser", "showDefaultAva
const Avatar = findComponentByCode(".AVATAR_STATUS_TYPING_16;");
const GroupDMAvatars = findComponentByCode(".AvatarSizeSpecs[", "getAvatarURL");
const ActionButtonClasses = findByProps("actionButton", "highlight");
interface IconProps extends React.ComponentPropsWithoutRef<"div"> {
size?: number;
}
@ -182,7 +184,7 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId, isActionButto
{props => {
const iconProps: IconProps = {
...props,
className: classes(isActionButton ? cl("indicator-action-button") : cl("speaker-padding"), isMessageIndicator && cl("message-indicator"), shouldHighlight && cl("highlight")),
className: classes(isActionButton ? ActionButtonClasses.actionButton : cl("speaker-padding"), isMessageIndicator && cl("message-indicator"), shouldHighlight && ActionButtonClasses.highlight),
size: isActionButton ? 20 : undefined,
onClick
};

View file

@ -23,18 +23,6 @@
position: relative;
}
.vc-uvs-indicator-action-button {
background-color: var(--background-secondary);
border-radius: 100%;
height: 36px;
width: 36px;
margin-left: 10px;
}
.vc-uvs-indicator-action-button.vc-uvs-highlight {
background-color: var(--background-tertiary);
}
.vc-uvs-tooltip-container {
max-width: 300px;
}