mirror of
https://github.com/Vendicated/Vencord.git
synced 2025-01-09 17:36:23 +00:00
Merge branch 'dev' into immediate-finds
This commit is contained in:
commit
cf1b7e2025
5 changed files with 20 additions and 5 deletions
|
@ -1,6 +1,7 @@
|
||||||
.vc-cfc-button {
|
.vc-cfc-button {
|
||||||
color: var(--interactive-normal);
|
color: var(--interactive-normal);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
padding-left: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-cfc-button:hover {
|
.vc-cfc-button:hover {
|
||||||
|
|
|
@ -100,6 +100,20 @@ export default definePlugin({
|
||||||
replace: "true$1VencordNative.native.openExternal"
|
replace: "true$1VencordNative.native.openExternal"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
find: "no artist ids in metadata",
|
||||||
|
predicate: () => !IS_DISCORD_DESKTOP && pluginSettings.store.spotify,
|
||||||
|
replacement: [
|
||||||
|
{
|
||||||
|
match: /\i\.\i\.isProtocolRegistered\(\)/g,
|
||||||
|
replace: "true"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: /!\(0,\i\.isDesktop\)\(\)/,
|
||||||
|
replace: "false"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
find: ".CONNECTED_ACCOUNT_VIEWED,",
|
find: ".CONNECTED_ACCOUNT_VIEWED,",
|
||||||
replacement: {
|
replacement: {
|
||||||
|
|
|
@ -12,7 +12,7 @@ import { Flex, Menu } from "@webpack/common";
|
||||||
|
|
||||||
const DefaultEngines = {
|
const DefaultEngines = {
|
||||||
Google: "https://www.google.com/search?q=",
|
Google: "https://www.google.com/search?q=",
|
||||||
DuckDuckGo: "https://duckduckgo.com/",
|
DuckDuckGo: "https://duckduckgo.com/?q=",
|
||||||
Brave: "https://search.brave.com/search?q=",
|
Brave: "https://search.brave.com/search?q=",
|
||||||
Bing: "https://www.bing.com/search?q=",
|
Bing: "https://www.bing.com/search?q=",
|
||||||
Yahoo: "https://search.yahoo.com/search?p=",
|
Yahoo: "https://search.yahoo.com/search?p=",
|
||||||
|
|
|
@ -130,8 +130,8 @@ function VoiceChannelTooltip({ channel, isLocked }: VoiceChannelTooltipProps) {
|
||||||
|
|
||||||
interface VoiceChannelIndicatorProps {
|
interface VoiceChannelIndicatorProps {
|
||||||
userId: string;
|
userId: string;
|
||||||
isActionButton?: boolean;
|
|
||||||
isMessageIndicator?: boolean;
|
isMessageIndicator?: boolean;
|
||||||
|
isActionButton?: boolean;
|
||||||
shouldHighlight?: boolean;
|
shouldHighlight?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,7 +184,7 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId, isActionButto
|
||||||
{props => {
|
{props => {
|
||||||
const iconProps: IconProps = {
|
const iconProps: IconProps = {
|
||||||
...props,
|
...props,
|
||||||
className: classes(isActionButton ? ActionButtonClasses.actionButton : cl("speaker-padding"), isMessageIndicator && cl("message-indicator"), shouldHighlight && ActionButtonClasses.highlight),
|
className: classes(isMessageIndicator && cl("message-indicator"), !isActionButton && cl("speaker-margin"), isActionButton && ActionButtonClasses.actionButton, shouldHighlight && ActionButtonClasses.highlight),
|
||||||
size: isActionButton ? 20 : undefined,
|
size: isActionButton ? 20 : undefined,
|
||||||
onClick
|
onClick
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
color: var(--interactive-hover);
|
color: var(--interactive-hover);
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-uvs-speaker-padding {
|
.vc-uvs-speaker-margin {
|
||||||
padding: 0 4px;
|
margin-left: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-uvs-message-indicator {
|
.vc-uvs-message-indicator {
|
||||||
|
|
Loading…
Reference in a new issue