{{ t('view.charts.instance_activity.header') }}
@@ -171,6 +172,7 @@
import { toDate } from 'reka-ui/date';
import { useI18n } from 'vue-i18n';
+ import BackToTop from '@/components/BackToTop.vue';
import dayjs from 'dayjs';
import { Popover, PopoverContent, PopoverTrigger } from '../../../components/ui/popover';
@@ -204,7 +206,7 @@
function setInstanceActivityHeight() {
if (instanceActivityRef.value) {
- const availableHeight = window.innerHeight - 100;
+ const availableHeight = window.innerHeight - 110;
instanceActivityRef.value.style.height = `${availableHeight}px`;
instanceActivityRef.value.style.overflowY = 'auto';
}
diff --git a/src/views/Favorites/FavoritesAvatar.vue b/src/views/Favorites/FavoritesAvatar.vue
index cd63f54d..83160ad9 100644
--- a/src/views/Favorites/FavoritesAvatar.vue
+++ b/src/views/Favorites/FavoritesAvatar.vue
@@ -146,7 +146,7 @@
+ class="w-45 p-1 rounded-lg">
No Data
-
+
@@ -529,6 +529,7 @@
import { ArrowUpDown, Check, Ellipsis, Loader, MoreHorizontal, Plus, RefreshCcw, RefreshCw } from 'lucide-vue-next';
import { InputGroupField, InputGroupSearch } from '@/components/ui/input-group';
import { Button } from '@/components/ui/button';
+ import { ScrollArea } from '@/components/ui/scroll-area';
import { Spinner } from '@/components/ui/spinner';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
@@ -1101,7 +1102,7 @@
if (!isLocalGroupSelected.value || isSearchActive.value) {
return;
}
- const wrap = localAvatarScrollbarRef.value?.wrapRef;
+ const wrap = localAvatarScrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
}
@@ -1135,7 +1136,7 @@
if (!isLocalGroupSelected.value || isSearchActive.value) {
return;
}
- const wrap = localAvatarScrollbarRef.value?.wrapRef;
+ const wrap = localAvatarScrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
}
diff --git a/src/views/Favorites/FavoritesWorld.vue b/src/views/Favorites/FavoritesWorld.vue
index f62f2419..3753e67b 100644
--- a/src/views/Favorites/FavoritesWorld.vue
+++ b/src/views/Favorites/FavoritesWorld.vue
@@ -404,7 +404,7 @@
No Data
No Data
-
+
No Data
@@ -440,6 +440,7 @@
import { ArrowUpDown, Ellipsis, MoreHorizontal, Plus, RefreshCcw, RefreshCw } from 'lucide-vue-next';
import { InputGroupField, InputGroupSearch } from '@/components/ui/input-group';
import { Button } from '@/components/ui/button';
+ import { ScrollArea } from '@/components/ui/scroll-area';
import { Spinner } from '@/components/ui/spinner';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
@@ -1004,7 +1005,7 @@
if (!isLocalGroupSelected.value || isSearchActive.value) {
return;
}
- const wrap = localFavoritesScrollbarRef.value?.wrapRef;
+ const wrap = localFavoritesScrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
}
@@ -1097,7 +1098,7 @@
if (!isLocalGroupSelected.value || isSearchActive.value) {
return;
}
- const wrap = localFavoritesScrollbarRef.value?.wrapRef;
+ const wrap = localFavoritesScrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
}
diff --git a/src/views/Favorites/dialogs/WorldImportDialog.vue b/src/views/Favorites/dialogs/WorldImportDialog.vue
index 87fec2e2..fa8c05a2 100644
--- a/src/views/Favorites/dialogs/WorldImportDialog.vue
+++ b/src/views/Favorites/dialogs/WorldImportDialog.vue
@@ -25,8 +25,8 @@
:rows="10"
style="margin-top: 10px"
input-class="resize-none" />
-
-
+
+
) : null;
@@ -318,6 +319,7 @@ export const columns = [
location={original.location}
hint={original.worldName}
grouphint={original.groupName}
+ disableTooltip
/>
) : null;
@@ -350,7 +352,7 @@ export const columns = [
}
return (
-
+
{original.statusDescription}
-
+
);
}
@@ -379,13 +381,9 @@ export const columns = [
if (type === 'Bio') {
return (
-
+
+ {original.bio}
+
);
}
diff --git a/src/views/FriendsLocations/FriendsLocations.vue b/src/views/FriendsLocations/FriendsLocations.vue
index 24356030..54fc5e81 100644
--- a/src/views/FriendsLocations/FriendsLocations.vue
+++ b/src/views/FriendsLocations/FriendsLocations.vue
@@ -58,7 +58,7 @@
{{ t('view.friends_locations.loading_more') }}
-
+
{{ t('view.friends_locations.loading_more') }}
-
+
@@ -164,6 +164,7 @@
import { Loader2, Settings } from 'lucide-vue-next';
import { Button } from '@/components/ui/button';
import { InputGroupSearch } from '@/components/ui/input-group';
+ import { ScrollArea } from '@/components/ui/scroll-area';
import { storeToRefs } from 'pinia';
import { useI18n } from 'vue-i18n';
@@ -262,7 +263,7 @@
let cleanupResize;
const updateGridWidth = () => {
- const wrap = scrollbarRef.value?.wrapRef;
+ const wrap = scrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
}
@@ -276,7 +277,7 @@
cleanupResize = undefined;
}
- const wrap = scrollbarRef.value?.wrapRef;
+ const wrap = scrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
}
@@ -559,7 +560,7 @@
return;
}
- const wrap = scrollbarRef.value?.wrapRef;
+ const wrap = scrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
@@ -590,7 +591,7 @@
function maybeFillViewport() {
nextTick(() => {
- const wrap = scrollbarRef.value?.wrapRef;
+ const wrap = scrollbarRef.value?.viewportEl?.value;
if (!wrap) {
return;
}
@@ -634,7 +635,6 @@
return;
}
nextTick(() => {
- scrollbarRef.value?.update?.();
updateGridWidth();
maybeFillViewport();
});
@@ -697,7 +697,6 @@
settingsReady.value = true;
nextTick(() => {
setupResizeHandling();
- scrollbarRef.value?.update?.();
updateGridWidth();
maybeFillViewport();
});
diff --git a/src/views/Settings/components/Tabs/AppearanceTab.vue b/src/views/Settings/components/Tabs/AppearanceTab.vue
index ae2c2cb1..44206501 100644
--- a/src/views/Settings/components/Tabs/AppearanceTab.vue
+++ b/src/views/Settings/components/Tabs/AppearanceTab.vue
@@ -352,66 +352,52 @@
@change="updateTrustColor('', '', true)">
-
-
+ :presets="['#CCCCCC']"
+ @change="updateTrustColor('untrusted', $event)" />
Visitor
-
-
+ :presets="['#1778ff']"
+ @change="updateTrustColor('basic', $event)" />
New User
-
-
+ :presets="['#2bcf5c']"
+ @change="updateTrustColor('known', $event)" />
User
-
-
+ :presets="['#ff7b42']"
+ @change="updateTrustColor('trusted', $event)" />
Known User
-
-
+ :presets="['#b18fff', '#8143e6', '#ff69b4', '#b52626', '#ffd000', '#abcdef']"
+ @change="updateTrustColor('veteran', $event)" />
Trusted User
-
-
+ :presets="['#ff2626']"
+ @change="updateTrustColor('vip', $event)" />
VRChat Team
-
-
+ :presets="['#782f2f']"
+ @change="updateTrustColor('troll', $event)" />
Nuisance
@@ -445,6 +431,8 @@
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
+ import PresetColorPicker from '@/components/PresetColorPicker.vue';
+
import { useAppearanceSettingsStore, useFavoriteStore, useVrStore } from '../../../../stores';
import { getLanguageName, languageCodes } from '../../../../localization';
import { THEME_CONFIG } from '../../../../shared/constants';
diff --git a/src/views/Sidebar/Sidebar.vue b/src/views/Sidebar/Sidebar.vue
index 0ffe0ae5..0f6b835b 100644
--- a/src/views/Sidebar/Sidebar.vue
+++ b/src/views/Sidebar/Sidebar.vue
@@ -4,10 +4,7 @@
-
+
@@ -89,14 +87,19 @@
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
@@ -104,16 +107,19 @@