diff --git a/src/components/NavMenu.vue b/src/components/NavMenu.vue index c6e9cb18..fe67d4a2 100644 --- a/src/components/NavMenu.vue +++ b/src/components/NavMenu.vue @@ -32,7 +32,7 @@ @click="handleMenuItemClick(item)"> + class="inline-flex size-6 items-center justify-center text-lg" /> {{ item.titleIsCustom ? item.title : t(item.title || '') }} @@ -53,7 +53,7 @@ :class="isNavItemNotified(item) ? 'notify' : undefined"> + class="inline-flex size-6 items-center justify-center text-lg" /> {{ item.titleIsCustom ? item.title : t(item.title || '') }} @@ -72,7 +72,7 @@ + class="inline-flex size-5 items-center justify-center text-base" /> {{ t(entry.label) }} @@ -93,8 +93,7 @@ - + {{ t('nav_tooltip.help_support') }} @@ -123,8 +122,7 @@ - + {{ t('nav_tooltip.manage') }} @@ -209,7 +207,7 @@ {{ t('nav_tooltip.toggle_theme') }} @@ -416,7 +414,6 @@ const themes = computed(() => Object.keys(THEME_CONFIG)); const { themeColors, currentThemeColor, isApplyingThemeColor, applyThemeColor, initThemeColor } = useThemeColor(); - const currentThemeIsDark = computed(() => isDarkMode.value); watch( () => locale.value, diff --git a/src/components/dialogs/AvatarDialog/AvatarDialog.vue b/src/components/dialogs/AvatarDialog/AvatarDialog.vue index 5cf1e4e5..e360913b 100644 --- a/src/components/dialogs/AvatarDialog/AvatarDialog.vue +++ b/src/components/dialogs/AvatarDialog/AvatarDialog.vue @@ -4,7 +4,7 @@ class="x-dialog x-avatar-dialog sm:max-w-235 translate-y-0" style="top: 10vh" :show-close-button="false"> - + {{ t('dialog.favorite.header') }} - + {{ t('dialog.favorite.vrchat_favorites') }} - + @@ -1098,7 +1095,6 @@ v-model="groupDialogGalleryCurrentName" :items="groupGalleryTabs" :unmount-on-hide="false" - v-loading="isGroupGalleryLoading" class="mt-2.5"> {{ t('dialog.invite.header') }} - + {{ diff --git a/src/components/dialogs/InviteGroupDialog.vue b/src/components/dialogs/InviteGroupDialog.vue index 642a78ae..6ff7feb2 100644 --- a/src/components/dialogs/InviteGroupDialog.vue +++ b/src/components/dialogs/InviteGroupDialog.vue @@ -5,7 +5,7 @@ {{ t('dialog.invite_to_group.header') }} - + {{ t('dialog.invite_to_group.description') }} diff --git a/src/components/dialogs/UserDialog/BioDialog.vue b/src/components/dialogs/UserDialog/BioDialog.vue index 0206747a..a87cd9e5 100644 --- a/src/components/dialogs/UserDialog/BioDialog.vue +++ b/src/components/dialogs/UserDialog/BioDialog.vue @@ -5,7 +5,7 @@ {{ t('dialog.bio.header') }} - + {{ t('dialog.language.header') }} - + {{ t('dialog.pronouns.header') }} - + {{ t('dialog.social_status.header') }} - + diff --git a/src/components/dialogs/UserDialog/UserDialog.vue b/src/components/dialogs/UserDialog/UserDialog.vue index 9122110a..9c91bd80 100644 --- a/src/components/dialogs/UserDialog/UserDialog.vue +++ b/src/components/dialogs/UserDialog/UserDialog.vue @@ -4,7 +4,7 @@ class="x-dialog x-user-dialog sm:max-w-235 translate-y-0" style="top: 10vh" :show-close-button="false"> - + {{ userDialog.ref?.displayName || userDialog.id || t('dialog.user.info.header') @@ -194,7 +194,7 @@ " class="extra"> - + {{ t('dialog.vrcx_updater.header') }} - + diff --git a/src/components/dialogs/WorldDialog/WorldDialog.vue b/src/components/dialogs/WorldDialog/WorldDialog.vue index 3682906d..949ce226 100644 --- a/src/components/dialogs/WorldDialog/WorldDialog.vue +++ b/src/components/dialogs/WorldDialog/WorldDialog.vue @@ -10,7 +10,7 @@ {{ worldDialog.ref?.description || worldDialog.ref?.name || t('dialog.world.info.header') }} - + - + diff --git a/src/views/Favorites/FavoritesAvatar.vue b/src/views/Favorites/FavoritesAvatar.vue index 80022c79..2e5aa1b7 100644 --- a/src/views/Favorites/FavoritesAvatar.vue +++ b/src/views/Favorites/FavoritesAvatar.vue @@ -1,5 +1,5 @@ - + diff --git a/src/views/Favorites/FavoritesFriend.vue b/src/views/Favorites/FavoritesFriend.vue index 2d658f00..915ac6d3 100644 --- a/src/views/Favorites/FavoritesFriend.vue +++ b/src/views/Favorites/FavoritesFriend.vue @@ -1,5 +1,5 @@ - + diff --git a/src/views/Favorites/FavoritesWorld.vue b/src/views/Favorites/FavoritesWorld.vue index 9a927885..2abbb399 100644 --- a/src/views/Favorites/FavoritesWorld.vue +++ b/src/views/Favorites/FavoritesWorld.vue @@ -1,5 +1,5 @@ - + diff --git a/src/views/FriendList/FriendList.vue b/src/views/FriendList/FriendList.vue index 6c82b339..72778545 100644 --- a/src/views/FriendList/FriendList.vue +++ b/src/views/FriendList/FriendList.vue @@ -181,7 +181,6 @@ const friendsListColumns = computed(() => createColumns({ randomUserColours, - bulkUnfriendMode: friendsListBulkUnfriendMode, selectedFriends, onToggleFriendSelection: toggleFriendSelection, onConfirmDeleteFriend: confirmDeleteFriend @@ -227,6 +226,18 @@ { immediate: true } ); + watch( + friendsListBulkUnfriendMode, + (enabled) => { + const column = table?.getColumn?.('bulkSelect'); + if (!column) { + return; + } + column.toggleVisibility(Boolean(enabled)); + }, + { immediate: true } + ); + watch(pageSize, (size) => { if (pagination.value.pageSize === size) { return; diff --git a/src/views/FriendList/columns.jsx b/src/views/FriendList/columns.jsx index 5f4bf06c..6ce48049 100644 --- a/src/views/FriendList/columns.jsx +++ b/src/views/FriendList/columns.jsx @@ -91,16 +91,26 @@ const sortByLanguages = (rowA, rowB) => export const createColumns = ({ randomUserColours, - bulkUnfriendMode, selectedFriends, onToggleFriendSelection, onConfirmDeleteFriend }) => { - /** @type {import('@tanstack/vue-table').ColumnDef[]} */ const cols = []; - if (bulkUnfriendMode?.value) { - cols.push({ + cols.push( + { + id: 'leftSpacer', + header: () => null, + size: 20, + enableSorting: false, + enableResizing: false, + meta: { + thClass: 'p-0', + tdClass: 'p-0' + }, + cell: () => null + }, + { id: 'bulkSelect', header: () => null, size: 55, @@ -127,21 +137,6 @@ export const createColumns = ({ ); } - }); - } - - cols.push( - { - id: 'leftSpacer', - header: () => null, - size: 20, - enableSorting: false, - enableResizing: false, - meta: { - thClass: 'p-0', - tdClass: 'p-0' - }, - cell: () => null }, { id: 'friendNumber', diff --git a/src/views/FriendLog/columns.jsx b/src/views/FriendLog/columns.jsx index c1abd5ca..ac41fe6b 100644 --- a/src/views/FriendLog/columns.jsx +++ b/src/views/FriendLog/columns.jsx @@ -31,7 +31,7 @@ export const createColumns = ({ onDelete, onDeletePrompt }) => { }, { accessorKey: 'created_at', - size: 90, + size: 100, header: ({ column }) => ( { { accessorKey: 'type', - size: 110, + size: 120, header: () => t('table.friendLog.type'), cell: ({ row }) => { const type = row.getValue('type'); diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index a2c804e5..aca77515 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -11,7 +11,7 @@ /> - + diff --git a/src/views/Moderation/columns.jsx b/src/views/Moderation/columns.jsx index 8a4e545a..7b3e13c0 100644 --- a/src/views/Moderation/columns.jsx +++ b/src/views/Moderation/columns.jsx @@ -32,7 +32,7 @@ export const createColumns = ({ onDelete, onDeletePrompt }) => { }, { accessorKey: 'created', - size: 90, + size: 100, header: ({ column }) => ( { }, { accessorKey: 'type', - size: 90, + size: 100, header: () => t('table.moderation.type'), cell: ({ row }) => { const type = row.getValue('type'); diff --git a/src/views/PlayerList/dialogs/ChatboxBlacklistDialog.vue b/src/views/PlayerList/dialogs/ChatboxBlacklistDialog.vue index f7f8ff05..6572e2c7 100644 --- a/src/views/PlayerList/dialogs/ChatboxBlacklistDialog.vue +++ b/src/views/PlayerList/dialogs/ChatboxBlacklistDialog.vue @@ -4,7 +4,7 @@ {{ t('dialog.chatbox_blacklist.header') }} - + {{ t('dialog.chatbox_blacklist.keyword_blacklist') }} - + {{ t('view.search.user.search_by_bio') }} @@ -75,7 +75,7 @@ - + - + - + {{ t('dialog.change_log.header') }} - + {{ t('dialog.change_log.description') }} diff --git a/src/views/Settings/dialogs/VRChatConfigDialog.vue b/src/views/Settings/dialogs/VRChatConfigDialog.vue index ba85b4c1..5dcf23df 100644 --- a/src/views/Settings/dialogs/VRChatConfigDialog.vue +++ b/src/views/Settings/dialogs/VRChatConfigDialog.vue @@ -4,7 +4,7 @@ {{ t('dialog.config_json.header') }} - + {{ t('dialog.config_json.description1') }} {{ t('dialog.config_json.description2') }} diff --git a/src/views/Sidebar/components/FriendsSidebar.vue b/src/views/Sidebar/components/FriendsSidebar.vue index e25bb640..909b326f 100644 --- a/src/views/Sidebar/components/FriendsSidebar.vue +++ b/src/views/Sidebar/components/FriendsSidebar.vue @@ -7,7 +7,7 @@ isFriendsGroupMe = !isFriendsGroupMe; saveFriendsGroupStates(); "> - + {{ t('side_panel.me') }} @@ -43,7 +43,7 @@ isVIPFriends = !isVIPFriends; saveFriendsGroupStates(); "> - + {{ t('side_panel.favorite') }} ― {{ vipFriendsDisplayNumber }} @@ -79,9 +79,7 @@ - + {{ t('side_panel.same_instance') }} ― {{ friendsInSameInstance.length }} @@ -116,7 +114,7 @@ isOnlineFriends = !isOnlineFriends; saveFriendsGroupStates(); "> - + {{ t('side_panel.online') }} ― {{ onlineFriendsByGroupStatus.length }} @@ -135,7 +133,7 @@ isActiveFriends = !isActiveFriends; saveFriendsGroupStates(); "> - + {{ t('side_panel.active') }} ― {{ activeFriends.length }} @@ -152,7 +150,7 @@ isOfflineFriends = !isOfflineFriends; saveFriendsGroupStates(); "> - + {{ t('side_panel.offline') }} ― {{ offlineFriends.length }} @@ -315,9 +313,6 @@ .x-link:hover { text-decoration: none; } - /* .x-link:hover span { - text-decoration: underline; - } */ .is-rotated { transform: rotate(-90deg); } diff --git a/src/views/Tools/Gallery.vue b/src/views/Tools/Gallery.vue index 38cff640..606ebd93 100644 --- a/src/views/Tools/Gallery.vue +++ b/src/views/Tools/Gallery.vue @@ -50,7 +50,7 @@ - + - + - + - + - + - + diff --git a/src/views/Tools/ScreenshotMetadata.vue b/src/views/Tools/ScreenshotMetadata.vue index ae378402..bb009605 100644 --- a/src/views/Tools/ScreenshotMetadata.vue +++ b/src/views/Tools/ScreenshotMetadata.vue @@ -6,7 +6,7 @@ {{ t('dialog.screenshot_metadata.header') }} - + {{ t('dialog.screenshot_metadata.drag') }} diff --git a/src/views/Tools/Tools.vue b/src/views/Tools/Tools.vue index 9a5ffd53..e91a796f 100644 --- a/src/views/Tools/Tools.vue +++ b/src/views/Tools/Tools.vue @@ -8,7 +8,7 @@ + :class="{ 'is-rotated': categoryCollapsed['group'] }" /> {{ t('view.tools.group.header') }} @@ -30,7 +30,7 @@ + :class="{ 'is-rotated': categoryCollapsed['image'] }" /> {{ t('view.tools.pictures.header') }} @@ -93,9 +93,7 @@ - + {{ t('view.tools.export.header') }} @@ -160,7 +158,7 @@ + :class="{ 'is-rotated': categoryCollapsed['other'] }" /> {{ t('view.tools.other.header') }} diff --git a/src/views/Tools/components/GroupCalendarEventCard.vue b/src/views/Tools/components/GroupCalendarEventCard.vue index 06588b32..c99a6eed 100644 --- a/src/views/Tools/components/GroupCalendarEventCard.vue +++ b/src/views/Tools/components/GroupCalendarEventCard.vue @@ -314,9 +314,6 @@ cursor: pointer; } - .event-card .badges .following-badge.is-following { - } - .event-card .badges .share-badge { display: flex; align-items: center; diff --git a/src/views/Tools/components/GroupCalendarMonth.vue b/src/views/Tools/components/GroupCalendarMonth.vue index f9411222..3c74de2f 100644 --- a/src/views/Tools/components/GroupCalendarMonth.vue +++ b/src/views/Tools/components/GroupCalendarMonth.vue @@ -91,7 +91,7 @@ - + - +