mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-05 22:36:05 +02:00
Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
+26
-1
@@ -417,4 +417,29 @@ i.x-user-status.busy {
|
|||||||
|
|
||||||
.x-user-dialog .el-tag+.el-tag {
|
.x-user-dialog .el-tag+.el-tag {
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.name.x-tag-untrusted {
|
||||||
|
color: rgb(204, 204, 204);
|
||||||
|
}
|
||||||
|
|
||||||
|
.name.x-tag-basic {
|
||||||
|
color: rgb(23, 120, 255);
|
||||||
|
}
|
||||||
|
|
||||||
|
.name.x-tag-user {
|
||||||
|
color: rgb(43, 207, 92);
|
||||||
|
}
|
||||||
|
|
||||||
|
.name.x-tag-known {
|
||||||
|
color: rgb(255, 123, 66);
|
||||||
|
}
|
||||||
|
|
||||||
|
.name.x-tag-trusted {
|
||||||
|
color: rgb(129, 67, 230);
|
||||||
|
}
|
||||||
|
|
||||||
|
.name.x-tag-veteran, .name.x-tag-legend {
|
||||||
|
color: rgb(255, 208, 0);
|
||||||
|
}
|
||||||
|
|||||||
+29
@@ -4155,6 +4155,35 @@ if (window.CefSharp) {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$app.methods.userNameColorClass = function (user) {
|
||||||
|
var style = { name: true };
|
||||||
|
if (!user) return style;
|
||||||
|
|
||||||
|
switch (user.trustLevel_) {
|
||||||
|
case "Legendary User":
|
||||||
|
style['x-tag-legendary'] = true;
|
||||||
|
break;
|
||||||
|
case "Veteran User":
|
||||||
|
style['x-tag-veteran'] = true;
|
||||||
|
break;
|
||||||
|
case "Trusted User":
|
||||||
|
style['x-tag-trusted'] = true;
|
||||||
|
break;
|
||||||
|
case "Known User":
|
||||||
|
style['x-tag-known'] = true;
|
||||||
|
break;
|
||||||
|
case "User":
|
||||||
|
style['x-tag-user'] = true;
|
||||||
|
break;
|
||||||
|
case "New User":
|
||||||
|
style['x-tag-basic'] = true;
|
||||||
|
case "Visitor":
|
||||||
|
style['x-tag-untrusted'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return style;
|
||||||
|
};
|
||||||
|
|
||||||
// App: Quick Search
|
// App: Quick Search
|
||||||
|
|
||||||
$app.data.quickSearch = '';
|
$app.data.quickSearch = '';
|
||||||
|
|||||||
+17
-17
@@ -328,7 +328,7 @@
|
|||||||
<img v-lazy="favorite.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="favorite.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="favorite.ref.displayName" class="name"></span>
|
<span v-text="favorite.ref.displayName" :class="userNameColorClass(favorite.ref)"></span>
|
||||||
<location v-if="favorite.ref.location !== 'offline'" :location="favorite.ref.location" :link="false" class="extra"></location>
|
<location v-if="favorite.ref.location !== 'offline'" :location="favorite.ref.location" :link="false" class="extra"></location>
|
||||||
<span v-else v-text="favorite.ref.statusDescription"></span>
|
<span v-else v-text="favorite.ref.statusDescription"></span>
|
||||||
</div>
|
</div>
|
||||||
@@ -760,7 +760,7 @@
|
|||||||
<div class="x-friend-item">
|
<div class="x-friend-item">
|
||||||
<template v-if="item.ref">
|
<template v-if="item.ref">
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="item.ref.displayName" class="name"></span>
|
<span v-text="item.ref.displayName" :class="userNameColorClass(item.ref)"></span>
|
||||||
<location :location="item.ref.location" :link="false" class="extra"></location>
|
<location :location="item.ref.location" :link="false" class="extra"></location>
|
||||||
</div>
|
</div>
|
||||||
<img v-lazy="item.ref.currentAvatarThumbnailImageUrl" class="avatar">
|
<img v-lazy="item.ref.currentAvatarThumbnailImageUrl" class="avatar">
|
||||||
@@ -781,8 +781,8 @@
|
|||||||
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-if="friend.memo" class="name">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
<span v-if="friend.memo" :class="userNameColorClass(friend.ref)">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
||||||
<span v-else v-text="friend.ref.displayName" class="name"></span>
|
<span v-else v-text="friend.ref.displayName" :class="userNameColorClass(friend.ref)"></span>
|
||||||
<location :location="friend.ref.location" :link="false" class="extra"></location>
|
<location :location="friend.ref.location" :link="false" class="extra"></location>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -803,8 +803,8 @@
|
|||||||
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-if="friend.memo" class="name">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
<span v-if="friend.memo" :class="userNameColorClass(friend.ref)">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
||||||
<span v-else v-text="friend.ref.displayName" class="name"></span>
|
<span v-else v-text="friend.ref.displayName" :class="userNameColorClass(friend.ref)"></span>
|
||||||
<location :location="friend.ref.location" :link="false" class="extra"></location>
|
<location :location="friend.ref.location" :link="false" class="extra"></location>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -825,8 +825,8 @@
|
|||||||
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-if="friend.memo" class="name">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
<span v-if="friend.memo" :class="userNameColorClass(friend.ref)">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
||||||
<span v-else v-text="friend.ref.displayName" class="name"></span>
|
<span v-else v-text="friend.ref.displayName" :class="userNameColorClass(friend.ref)"></span>
|
||||||
<span v-text="friend.ref.statusDescription" :link="false" class="extra"></span>
|
<span v-text="friend.ref.statusDescription" :link="false" class="extra"></span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -847,8 +847,8 @@
|
|||||||
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-if="friend.memo" class="name">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
<span v-if="friend.memo" :class="userNameColorClass(friend.ref)">{{ friend.ref.displayName }} ({{ friend.memo }})</span>
|
||||||
<span v-else v-text="friend.ref.displayName" class="name"></span>
|
<span v-else v-text="friend.ref.displayName" :class="userNameColorClass(friend.ref)"></span>
|
||||||
<span v-text="friend.ref.statusDescription" class="extra"></span>
|
<span v-text="friend.ref.statusDescription" class="extra"></span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -950,7 +950,7 @@
|
|||||||
<img v-lazy="userDialog.location_.user.currentAvatarThumbnailImageUrl">
|
<img v-lazy="userDialog.location_.user.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="userDialog.location_.user.displayName" class="name"></span>
|
<span v-text="userDialog.location_.user.displayName" :class="userNameColorClass(userDialog.location_.user)"></span>
|
||||||
<span class="extra">Instance Creator</span>
|
<span class="extra">Instance Creator</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -961,7 +961,7 @@
|
|||||||
<img v-lazy="user.currentAvatarThumbnailImageUrl">
|
<img v-lazy="user.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="user.displayName" class="name"></span>
|
<span v-text="user.displayName" :class="userNameColorClass(user)"></span>
|
||||||
<span class="extra"><timer :epoch="user.location_at_"></timer></span>
|
<span class="extra"><timer :epoch="user.location_at_"></timer></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -1100,7 +1100,7 @@
|
|||||||
<img v-lazy="room.location_.user.currentAvatarThumbnailImageUrl">
|
<img v-lazy="room.location_.user.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="room.location_.user.displayName" class="name"></span>
|
<span v-text="room.location_.user.displayName" :class="userNameColorClass(room.location_.user)"></span>
|
||||||
<span class="extra">Instance Creator</span>
|
<span class="extra">Instance Creator</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -1111,7 +1111,7 @@
|
|||||||
<img v-lazy="user.currentAvatarThumbnailImageUrl">
|
<img v-lazy="user.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="user.displayName" class="name"></span>
|
<span v-text="user.displayName" :class="userNameColorClass(user)"></span>
|
||||||
<span class="extra"><timer :epoch="user.location_at_"></timer></span>
|
<span class="extra"><timer :epoch="user.location_at_"></timer></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -1297,7 +1297,7 @@
|
|||||||
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="friend.ref.displayName" class="name"></span>
|
<span v-text="friend.ref.displayName" :class="userNameColorClass(friend.ref)"></span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<span v-else v-text="friend.id"></span>
|
<span v-else v-text="friend.id"></span>
|
||||||
@@ -1310,7 +1310,7 @@
|
|||||||
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="friend.ref.displayName" class="name"></span>
|
<span v-text="friend.ref.displayName" :class="userNameColorClass(friend.ref)"></span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<span v-else v-text="friend.id"></span>
|
<span v-else v-text="friend.id"></span>
|
||||||
@@ -1323,7 +1323,7 @@
|
|||||||
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
<img v-lazy="friend.ref.currentAvatarThumbnailImageUrl">
|
||||||
</div>
|
</div>
|
||||||
<div class="detail">
|
<div class="detail">
|
||||||
<span v-text="friend.ref.displayName" class="name"></span>
|
<span v-text="friend.ref.displayName" :class="userNameColorClass(friend.ref)"></span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<span v-else v-text="friend.id"></span>
|
<span v-else v-text="friend.id"></span>
|
||||||
|
|||||||
Reference in New Issue
Block a user