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

fix: some align problem (#1012)

Browse Source
This commit is contained in:
pa
2024-12-07 16:12:08 +09:00
committed by GitHub
parent 4ee98725e6
commit 764277904f
4 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.scss
+9
View File
@@ -692,6 +692,11 @@ i.x-user-status.busy {
padding: 0px 10px 10px 10px; padding: 0px 10px 10px 10px;
} }
.options-container .header-bar {
display: flex;
align-items: center;
}
.options-container .header { .options-container .header {
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
@@ -888,3 +893,7 @@ i.x-user-status.busy {
.max-height-el-select .el-select-dropdown__wrap { .max-height-el-select .el-select-dropdown__wrap {
max-height: 83vh; max-height: 83vh;
} }
.el-pagination .el-input .el-input__icon {
line-height: 22px;
}
html/src/mixins/tabs/favorites.pug
+4 -4
View File
@@ -1,6 +1,6 @@
mixin favoritesTab() mixin favoritesTab()
.x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'favorite'") .x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'favorite'")
div(style="font-size:13px;position:absolute;right:0;z-index:1") div(style="font-size:13px;position:absolute;right:0;z-index:1;margin-right:15px")
div(v-if="editFavoritesMode" style="display:inline-block;margin-right:10px") div(v-if="editFavoritesMode" style="display:inline-block;margin-right:10px")
el-button(size="small" @click="clearBulkFavoriteSelection ") {{ $t('view.favorite.clear') }} el-button(size="small" @click="clearBulkFavoriteSelection ") {{ $t('view.favorite.clear') }}
el-button(size="small" @click="bulkCopyFavoriteSelection") {{ $t('view.favorite.copy') }} el-button(size="small" @click="bulkCopyFavoriteSelection") {{ $t('view.favorite.copy') }}
@@ -15,7 +15,7 @@ mixin favoritesTab()
el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '0'" style="border:0") el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '0'" style="border:0")
el-button(size="small" @click="showFriendExportDialog") {{ $t('view.favorite.export') }} el-button(size="small" @click="showFriendExportDialog") {{ $t('view.favorite.export') }}
el-button(size="small" @click="showFriendImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }} el-button(size="small" @click="showFriendImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }}
div(style="display:inline-block;float:right;font-size:13px;margin-right:10px") div(style="display:flex;align-items:center;float:right;font-size:13px;margin-right:10px")
span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }} span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }}
el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption") el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption")
el-collapse-item(v-for="group in API.favoriteFriendGroups" :key="group.name") el-collapse-item(v-for="group in API.favoriteFriendGroups" :key="group.name")
@@ -57,7 +57,7 @@ mixin favoritesTab()
el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '1'" style="border:0") el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '1'" style="border:0")
el-button(size="small" @click="showWorldExportDialog") {{ $t('view.favorite.export') }} el-button(size="small" @click="showWorldExportDialog") {{ $t('view.favorite.export') }}
el-button(size="small" @click="showWorldImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }} el-button(size="small" @click="showWorldImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }}
div(style="display:inline-block;float:right;font-size:13px;margin-right:10px") div(style="display:flex;align-items:center;float:right;font-size:13px;margin-right:10px")
span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }} span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }}
el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption") el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption")
span(style="display:block;margin-top:20px") {{ $t('view.favorite.worlds.search') }} span(style="display:block;margin-top:20px") {{ $t('view.favorite.worlds.search') }}
@@ -168,7 +168,7 @@ mixin favoritesTab()
el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '2'" style="border:0") el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '2'" style="border:0")
el-button(size="small" @click="showAvatarExportDialog") {{ $t('view.favorite.export') }} el-button(size="small" @click="showAvatarExportDialog") {{ $t('view.favorite.export') }}
el-button(size="small" @click="showAvatarImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }} el-button(size="small" @click="showAvatarImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }}
div(style="display:inline-block;float:right;font-size:13px;margin-right:10px") div(style="display:flex;align-items:center;float:right;font-size:13px;margin-right:10px")
span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }} span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }}
el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption") el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption")
span(style="display:block;margin-top:20px") {{ $t('view.favorite.avatars.search') }} span(style="display:block;margin-top:20px") {{ $t('view.favorite.avatars.search') }}
html/src/mixins/tabs/profile.pug
+8
View File
@@ -37,6 +37,7 @@ mixin profileTab()
span.extra(v-if="visits") {{ $t('view.profile.game_info.user_online', { count: visits }) }} span.extra(v-if="visits") {{ $t('view.profile.game_info.user_online', { count: visits }) }}
span.extra(v-else) {{ $t('view.profile.game_info.refresh') }} span.extra(v-else) {{ $t('view.profile.game_info.refresh') }}
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.vrc_sdk_downloads.header') }} span.header {{ $t('view.profile.vrc_sdk_downloads.header') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="API.getConfig()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="API.getConfig()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
@@ -54,6 +55,7 @@ mixin profileTab()
el-button(size="small" @click="promptWorldDialog()") {{ $t('view.profile.direct_access.world_instance') }} el-button(size="small" @click="promptWorldDialog()") {{ $t('view.profile.direct_access.world_instance') }}
el-button(size="small" @click="promptAvatarDialog()") {{ $t('view.profile.direct_access.avatar') }} el-button(size="small" @click="promptAvatarDialog()") {{ $t('view.profile.direct_access.avatar') }}
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.invite_messages') }} span.header {{ $t('view.profile.invite_messages') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="inviteMessageTable.visible = true; refreshInviteMessageTable('message')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="inviteMessageTable.visible = true; refreshInviteMessageTable('message')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
@@ -69,6 +71,7 @@ mixin profileTab()
template(v-once #default="scope") template(v-once #default="scope")
el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('message', scope.row)") el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('message', scope.row)")
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.invite_response_messages') }} span.header {{ $t('view.profile.invite_response_messages') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="inviteResponseMessageTable.visible = true; refreshInviteMessageTable('response')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="inviteResponseMessageTable.visible = true; refreshInviteMessageTable('response')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
@@ -84,6 +87,7 @@ mixin profileTab()
template(v-once #default="scope") template(v-once #default="scope")
el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('response', scope.row)") el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('response', scope.row)")
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.invite_request_messages') }} span.header {{ $t('view.profile.invite_request_messages') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="inviteRequestMessageTable.visible = true; refreshInviteMessageTable('request')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="inviteRequestMessageTable.visible = true; refreshInviteMessageTable('request')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
@@ -99,6 +103,7 @@ mixin profileTab()
template(v-once #default="scope") template(v-once #default="scope")
el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('request', scope.row)") el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('request', scope.row)")
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.invite_request_response_messages') }} span.header {{ $t('view.profile.invite_request_response_messages') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="inviteRequestResponseMessageTable.visible = true; refreshInviteMessageTable('requestResponse')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="inviteRequestResponseMessageTable.visible = true; refreshInviteMessageTable('requestResponse')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
@@ -121,6 +126,7 @@ mixin profileTab()
span {{ scope.row.updated_at | formatDate('long') }} span {{ scope.row.updated_at | formatDate('long') }}
el-table-column(:label="$t('table.profile.previous_display_name.name')" prop="displayName") el-table-column(:label="$t('table.profile.previous_display_name.name')" prop="displayName")
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.config_json') }} span.header {{ $t('view.profile.config_json') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="refreshConfigTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="refreshConfigTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
@@ -132,6 +138,7 @@ mixin profileTab()
span(v-text="scope.data.key" style="font-weight:bold;margin-right:5px") span(v-text="scope.data.key" style="font-weight:bold;margin-right:5px")
span(v-if="!scope.data.children" v-text="scope.data.value") span(v-if="!scope.data.children" v-text="scope.data.value")
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.current_user_json') }} span.header {{ $t('view.profile.current_user_json') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="refreshCurrentUserTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="refreshCurrentUserTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
@@ -143,6 +150,7 @@ mixin profileTab()
span(v-text="scope.data.key" style="font-weight:bold;margin-right:5px") span(v-text="scope.data.key" style="font-weight:bold;margin-right:5px")
span(v-if="!scope.data.children" v-text="scope.data.value") span(v-if="!scope.data.children" v-text="scope.data.value")
div.options-container div.options-container
div.header-bar
span.header {{ $t('view.profile.feedback') }} span.header {{ $t('view.profile.feedback') }}
el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips") el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
el-button(type="default" @click="getCurrentUserFeedback()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-button(type="default" @click="getCurrentUserFeedback()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
html/src/mixins/tabs/settings.pug
+7 -7
View File
@@ -23,7 +23,7 @@ mixin simpleRadioGroup(nameTrKey, model, options, onChange="")
div.options-container-item div.options-container-item
span.name {{ $t('#{nameTrKey}') }} span.name {{ $t('#{nameTrKey}') }}
br br
el-radio-group(v-model=model @change=onChange size="mini") el-radio-group(v-model=model @change=onChange size="mini" style="margin-top:5px")
each option in options each option in options
el-radio-button(label=option.label) {{ $t('#{option.translationKey}') }} el-radio-button(label=option.label) {{ $t('#{option.translationKey}') }}
@@ -33,7 +33,7 @@ mixin simpleRadioGroupWithTooltip(nameTrKey, tooltipContent, model, options, onC
el-tooltip(placement="top" style="margin-left:5px" :content=tooltipContent) el-tooltip(placement="top" style="margin-left:5px" :content=tooltipContent)
i.el-icon-warning i.el-icon-warning
br br
el-radio-group(v-model=model @change=onChange size="mini") el-radio-group(v-model=model @change=onChange size="mini" style="margin-top:5px")
each option in options each option in options
el-radio-button(label=option.label) {{ $t('#{option.translationKey}') }} el-radio-button(label=option.label) {{ $t('#{option.translationKey}') }}
@@ -98,7 +98,7 @@ mixin settingsTab()
//- General | Favorite //- General | Favorite
+simpleSettingsCategory("view.settings.general.favorites.header") +simpleSettingsCategory("view.settings.general.favorites.header")
br br
el-select(v-model="localFavoriteFriendsGroups" multiple clearable :placeholder="$t('view.settings.general.favorites.group_placeholder')" @change="updateLocalFavoriteFriends") el-select(v-model="localFavoriteFriendsGroups" multiple clearable :placeholder="$t('view.settings.general.favorites.group_placeholder')" @change="updateLocalFavoriteFriends" style="margin-top:8px")
el-option-group(:label="$t('view.settings.general.favorites.group_placeholder')") el-option-group(:label="$t('view.settings.general.favorites.group_placeholder')")
el-option.x-friend-item(v-for="group in API.favoriteFriendGroups" :key="group.key" :label="group.displayName ? group.displayName : group.name" :value="group.key") el-option.x-friend-item(v-for="group in API.favoriteFriendGroups" :key="group.key" :label="group.displayName ? group.displayName : group.name" :value="group.key")
.detail .detail
@@ -252,7 +252,7 @@ mixin settingsTab()
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.user_dialog.export_vrcx_memos_into_vrchat_notes') }} span.name {{ $t('view.settings.appearance.user_dialog.export_vrcx_memos_into_vrchat_notes') }}
br br
el-button(size="small" icon="el-icon-document-copy" @click="showNoteExportDialog") {{ $t('view.settings.appearance.user_dialog.export_notes') }} el-button(size="small" icon="el-icon-document-copy" @click="showNoteExportDialog" style="margin-top:5px") {{ $t('view.settings.appearance.user_dialog.export_notes') }}
//- Appearance | Friend Log //- Appearance | Friend Log
div.options-container div.options-container
span.header {{ $t('view.settings.appearance.friend_log.header') }} span.header {{ $t('view.settings.appearance.friend_log.header') }}
@@ -325,7 +325,7 @@ mixin settingsTab()
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display') }} span.name {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display') }}
br br
el-radio-group(v-model="desktopToast" @change="saveOpenVROption" size="mini") el-radio-group(v-model="desktopToast" @change="saveOpenVROption" size="mini" style="margin-top:5px")
el-radio-button(label="Never") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_never') }} el-radio-button(label="Never") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_never') }}
el-radio-button(label="Desktop Mode") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_desktop') }} el-radio-button(label="Desktop Mode") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_desktop') }}
el-radio-button(label="Inside VR") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_inside_vr') }} el-radio-button(label="Inside VR") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_inside_vr') }}
@@ -342,7 +342,7 @@ mixin settingsTab()
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play') }} span.name {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play') }}
br br
el-radio-group(v-model="notificationTTS" @change="saveNotificationTTS" size="mini") el-radio-group(v-model="notificationTTS" @change="saveNotificationTTS" size="mini" style="margin-top:5px")
el-radio-button(label="Never") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_never') }} el-radio-button(label="Never") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_never') }}
el-radio-button(label="Inside VR") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_inside_vr') }} el-radio-button(label="Inside VR") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_inside_vr') }}
el-radio-button(label="Game Closed") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_game_closed') }} el-radio-button(label="Game Closed") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_game_closed') }}
@@ -504,7 +504,7 @@ mixin settingsTab()
//- Advanced | Automatic App Launcher //- Advanced | Automatic App Launcher
+simpleSettingsCategory("view.settings.advanced.advanced.app_launcher.header") +simpleSettingsCategory("view.settings.advanced.advanced.app_launcher.header")
br br
el-button(size="small" icon="el-icon-folder" @click="openShortcutFolder()") {{ $t('view.settings.advanced.advanced.app_launcher.folder') }} el-button(size="small" icon="el-icon-folder" @click="openShortcutFolder()" style="margin-top:5px") {{ $t('view.settings.advanced.advanced.app_launcher.folder') }}
el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.app_launcher.folder_tooltip')") el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.app_launcher.folder_tooltip')")
i.el-icon-warning i.el-icon-warning
+simpleSwitch("view.settings.advanced.advanced.app_launcher.enable", "enableAppLauncher", "updateAppLauncherSettings") +simpleSwitch("view.settings.advanced.advanced.app_launcher.enable", "enableAppLauncher", "updateAppLauncherSettings")