MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 22:46:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix friend sidebar styling

Browse Source
This commit is contained in:
Natsumi
2025-01-26 06:03:05 +13:00
parent 5214522789
commit acf62b138b
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app.js
+2 -1
View File
@@ -23276,7 +23276,8 @@ console.log(`isLinux: ${LINUX}`);
$app.computed.friendsInSameInstance = function () { $app.computed.friendsInSameInstance = function () {
const friendsList = {}; const friendsList = {};
this.friends.forEach((friend) => { const allFriends = [...this.vipFriends, ...this.onlineFriends];
allFriends.forEach((friend) => {
if (!friend.ref?.$location.isRealInstance) return; if (!friend.ref?.$location.isRealInstance) return;
const key = friend.ref.$location.tag; const key = friend.ref.$location.tag;
src/app.scss
+2 -1
View File
@@ -519,7 +519,8 @@ img.friends-list-avatar {
color: #303133; color: #303133;
} }
.x-friend-item > .detail > .extra { .x-friend-item > .detail > .extra,
.extra {
font-weight: normal; font-weight: normal;
color: #606266; color: #606266;
} }
src/mixins/friendsListSidebar.pug
+7 -7
View File
@@ -95,13 +95,13 @@ mixin friendsListSidebar
//- Group By Instance //- Group By Instance
template(v-if='isSidebarGroupByInstance && friendsInSameInstance.length') template(v-if='isSidebarGroupByInstance && friendsInSameInstance.length')
.x-friend-group.x-link(@click='toggleSwitchGroupByInstanceCollapsed') .x-friend-group.x-link(@click='toggleSwitchGroupByInstanceCollapsed')
i.el-icon-arrow-right(:class='{ rotate: isSidebarGroupByInstanceCollapsed }') i.el-icon-arrow-right(:class='{ rotate: !isSidebarGroupByInstanceCollapsed }')
span(style='margin-left: 5px') {{ $t('side_panel.same_instance') }} ― {{ friendsInSameInstance.length }} span(style='margin-left: 5px') {{ $t('side_panel.same_instance') }} ― {{ friendsInSameInstance.length }}
div(v-show='!isSidebarGroupByInstanceCollapsed') div(v-show='!isSidebarGroupByInstanceCollapsed')
div(v-for='friendArr in friendsInSameInstance' :key='friendArr[0].ref?.$location.tag') div(v-for='friendArr in friendsInSameInstance' :key='friendArr[0].ref?.$location.tag')
div(style='margin-bottom: 3px') div(style='margin-bottom: 3px')
location.extra(:location='getFriendsLocations(friendArr)' style='color: #c7c7c7') location.extra(:location='getFriendsLocations(friendArr)')
span(style='margin-left: 5px') {{ `(${friendArr.length})` }} span.extra(style='margin-left: 5px') {{ `(${friendArr.length})` }}
div div
.x-friend-item( .x-friend-item(
v-if='friendArr && friendArr.length' v-if='friendArr && friendArr.length'
@@ -113,11 +113,11 @@ mixin friendsListSidebar
.avatar(:class='userStatusClass(friend.ref, friend.pendingOffline)') .avatar(:class='userStatusClass(friend.ref, friend.pendingOffline)')
img(v-lazy='userImage(friend.ref)') img(v-lazy='userImage(friend.ref)')
.detail .detail
div(style='display: flex; align-items: center') span.name(style='display: flex; align-items: center')
span.name( span(
v-if='!hideNicknames && friend.$nickName' v-if='!hideNicknames && friend.$nickName'
:style='{ color: friend.ref.$userColour }') {{ friend.ref.displayName }} ({{ friend.$nickName }}) :style='{ color: friend.ref.$userColour }') {{ friend.ref.displayName }} ({{ friend.$nickName }})
span.name( span(
v-else v-else
v-text='friend.ref.displayName' v-text='friend.ref.displayName'
:style='{ color: friend.ref.$userColour }') :style='{ color: friend.ref.$userColour }')
@@ -129,7 +129,7 @@ mixin friendsListSidebar
i.el-icon.el-icon-loading( i.el-icon.el-icon-loading(
v-if='friend.ref.travelingToLocation' v-if='friend.ref.travelingToLocation'
style='display: inline-block; margin-right: 5px') style='display: inline-block; margin-right: 5px')
timer(:epoch='friend.ref?.$location_at' style='color: #c7c7c7') timer.extra(:epoch='friend.ref?.$location_at')
template(v-else) template(v-else)
span(v-text='friend.name || friend.id') span(v-text='friend.name || friend.id')
el-button( el-button(
src/theme.dark.scss
+2 -1
View File
@@ -397,7 +397,8 @@ button {
color: #fff; color: #fff;
} }
.x-friend-item > .detail > .extra { .x-friend-item > .detail > .extra,
.extra {
color: #c7c7c7; color: #c7c7c7;
} }