MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-27 18:53:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

group dialog adjustments for themes

Browse Source
This commit is contained in:
Natsumi
2022-12-11 22:02:52 +13:00
parent db298a4d20
commit e5b64eb852
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
html/src/app.scss
View File

@@ -449,7 +449,8 @@ img.friends-list-avatar {
.x-user-dialog > .el-dialog > .el-dialog__header, .x-user-dialog > .el-dialog > .el-dialog__header,
.x-world-dialog > .el-dialog > .el-dialog__header, .x-world-dialog > .el-dialog > .el-dialog__header,
.x-avatar-dialog > .el-dialog > .el-dialog__header { .x-avatar-dialog > .el-dialog > .el-dialog__header,
.x-group-dialog > .el-dialog > .el-dialog__header {
display: none; display: none;
padding: 0; padding: 0;
} }
@@ -460,6 +461,14 @@ img.friends-list-avatar {
padding: 20px; padding: 20px;
} }
.x-group-dialog > .el-dialog > .el-dialog__body {
padding: 0;
}
.x-group-dialog > .el-dialog > .el-dialog__body > .group-body {
padding: 20px;
}
.el-popper.hex { .el-popper.hex {
min-width: auto; min-width: auto;
padding: 10px; padding: 10px;
@@ -673,3 +682,7 @@ i.x-user-status.busy {
.dialog-title { .dialog-title {
font-weight: bold; font-weight: bold;
} }
.group-banner-image {
display: none;
}

36
html/src/index.pug
View File

@@ -2161,25 +2161,28 @@ html
span(v-if="!scope.data.children" v-text="scope.data.value") span(v-if="!scope.data.children" v-text="scope.data.value")
//- dialog: group //- dialog: group
el-dialog.x-dialog.x-world-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="groupDialog" :visible.sync="groupDialog.visible" :show-close="false" width="770px") el-dialog.x-dialog.x-group-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="groupDialog" :visible.sync="groupDialog.visible" :show-close="false" width="770px")
div(v-loading="groupDialog.loading") .group-banner-image
el-popover(placement="right" width="500px" trigger="click")
img.x-link(slot="reference" v-lazy="groupDialog.ref.bannerUrl" style="flex:none;width:100%;aspect-ratio:6/1;object-fit:cover;border-radius:4px")
img.x-link(v-lazy="groupDialog.ref.bannerUrl" style="width:854px;height:480px" @click="openExternalLink(groupDialog.ref.bannerUrl)")
.group-body(v-loading="groupDialog.loading")
div(style="display:flex") div(style="display:flex")
el-popover(placement="right" width="500px" trigger="click") el-popover(placement="right" width="500px" trigger="click")
img.x-link(slot="reference" v-lazy="groupDialog.ref.iconUrl" style="flex:none;width:120px;height:120px;border-radius:4px") img.x-link(slot="reference" v-lazy="groupDialog.ref.iconUrl" style="flex:none;width:120px;height:120px;border-radius:4px")
img.x-link(v-lazy="groupDialog.ref.iconUrl" style="width:500px;height:500px" @click="openExternalLink(groupDialog.ref.iconUrl)") img.x-link(v-lazy="groupDialog.ref.iconUrl" style="width:500px;height:500px" @click="openExternalLink(groupDialog.ref.iconUrl)")
div(style="flex:1;display:flex;align-items:center;margin-left:15px") div(style="flex:1;display:flex;align-items:center;margin-left:15px")
div(style="flex:1") .group-header(style="flex:1")
div span(v-if="groupDialog.ref.ownerId === API.currentUser.id" style="margin-right:5px") 👑
span(v-if="groupDialog.ref.ownerId === API.currentUser.id" style="margin-right:5px") 👑 span.dialog-title(v-text="groupDialog.ref.name" style="margin-right:5px")
span.dialog-title(v-text="groupDialog.ref.name" style="margin-right:5px") span.group-discriminator(style="color:#909399;font-family:monospace;font-size:12px;margin-right:5px") {{ groupDialog.ref.shortCode }}.{{ groupDialog.ref.discriminator }}
span(style="color:#909399;font-family:monospace;font-size:12px;margin-right:5px") {{ groupDialog.ref.shortCode }}.{{ groupDialog.ref.discriminator }} el-tooltip(v-for="item in groupDialog.ref.$languages" :key="item.key" placement="top")
el-tooltip(v-for="item in groupDialog.ref.$languages" :key="item.key" placement="top") template(#content)
template(#content) span {{ item.value }} ({{ item.key }})
span {{ item.value }} ({{ item.key }}) span.flags(:class="languageClass(item.key)" style="display:inline-block;margin-right:5px")
span.flags(:class="languageClass(item.key)" style="display:inline-block;margin-right:5px")
div(style="margin-top:5px") div(style="margin-top:5px")
span.x-link(v-text="groupDialog.ownerDisplayName" @click="showUserDialog(groupDialog.ref.ownerId)" style="color:#909399;font-family:monospace") span.x-link(v-text="groupDialog.ownerDisplayName" @click="showUserDialog(groupDialog.ref.ownerId)" style="color:#909399;font-family:monospace")
div .group-tags
el-tag(v-if="groupDialog.ref.isVerified" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Verified el-tag(v-if="groupDialog.ref.isVerified" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Verified
el-tag(v-if="groupDialog.ref.privacy === 'private'" type="danger" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Private el-tag(v-if="groupDialog.ref.privacy === 'private'" type="danger" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Private
@@ -2199,7 +2202,7 @@ html
el-tag(v-else-if="groupDialog.ref.myMember.visibility === 'hidden'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Hidden el-tag(v-else-if="groupDialog.ref.myMember.visibility === 'hidden'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Hidden
el-tag(v-if="groupDialog.ref.myMember.isSubscribedToAnnouncements" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Subscribed el-tag(v-if="groupDialog.ref.myMember.isSubscribedToAnnouncements" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Subscribed
div(style="margin-top:5px") .group-description(style="margin-top:5px")
span(v-show="groupDialog.ref.name !== groupDialog.ref.description" v-text="groupDialog.ref.description" style="font-size:12px") span(v-show="groupDialog.ref.name !== groupDialog.ref.description" v-text="groupDialog.ref.description" style="font-size:12px")
div(style="flex:none;margin-left:10px") div(style="flex:none;margin-left:10px")
template(v-if="groupDialog.inGroup") template(v-if="groupDialog.inGroup")
@@ -2242,9 +2245,10 @@ html
el-dropdown-item(icon="el-icon-delete" command="Leave Group" style="color:#F56C6C" divided) Leave Group el-dropdown-item(icon="el-icon-delete" command="Leave Group" style="color:#F56C6C" divided) Leave Group
el-tabs(ref="groupDialogTabs" @tab-click="groupDialogTabClick") el-tabs(ref="groupDialogTabs" @tab-click="groupDialogTabClick")
el-tab-pane(label="Info") el-tab-pane(label="Info")
el-popover(placement="right" width="500px" trigger="click") .group-banner-image-info
img.x-link(slot="reference" v-lazy="groupDialog.ref.bannerUrl" style="flex:none;width:100%;aspect-ratio:6/1;object-fit:cover;border-radius:4px") el-popover(placement="right" width="500px" trigger="click")
img.x-link(v-lazy="groupDialog.ref.bannerUrl" style="width:854px;height:480px" @click="openExternalLink(groupDialog.ref.bannerUrl)") img.x-link(slot="reference" v-lazy="groupDialog.ref.bannerUrl" style="flex:none;width:100%;aspect-ratio:6/1;object-fit:cover;border-radius:4px")
img.x-link(v-lazy="groupDialog.ref.bannerUrl" style="width:854px;height:480px" @click="openExternalLink(groupDialog.ref.bannerUrl)")
.x-friend-list(style="max-height:none") .x-friend-list(style="max-height:none")
.x-friend-item(v-if="groupDialog.ref.membershipStatus === 'member'" style="width:100%;cursor:default") .x-friend-item(v-if="groupDialog.ref.membershipStatus === 'member'" style="width:100%;cursor:default")
.detail .detail