Skip to content

Commit

Permalink
improve(ui): tuning
Browse files Browse the repository at this point in the history
  • Loading branch information
Map1en committed Dec 19, 2024
1 parent 1523f0f commit 20964f7
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 16 deletions.
4 changes: 4 additions & 0 deletions html/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7923,6 +7923,10 @@ speechSynthesis.getVoices();
'VRCX_notificationTTSNickName',
false
);

// It's not necessary to store it in configRepo because it's rarely used.
$app.data.isTestTTSVisible = false;

$app.data.notificationTTSVoice = await configRepository.getString(
'VRCX_notificationTTSVoice',
'0'
Expand Down
2 changes: 1 addition & 1 deletion html/src/mixins/dialogs/feedFilters.pug
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ mixin feedFilters()
el-radio-button(label="On") {{ $t('dialog.shared_feed_filters.on') }}
template(#footer)
el-button(type="small" @click="resetSharedFeedFilters") {{ $t('dialog.shared_feed_filters.reset') }}
el-button(size="small" style="margin-left:10px" @click="notyFeedFiltersDialog.visible = false") {{ $t('dialog.shared_feed_filters.close') }}
el-button(size="small" type="primary" style="margin-left:10px" @click="notyFeedFiltersDialog.visible = false") {{ $t('dialog.shared_feed_filters.close') }}

//- dialog: wrist feed filters
el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="wristFeedFiltersDialog" :visible.sync="wristFeedFiltersDialog.visible" :title="$t('dialog.shared_feed_filters.wrist')" width="550px")
Expand Down
6 changes: 3 additions & 3 deletions html/src/mixins/tabs/favorites.pug
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
mixin favoritesTab()
.x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'favorite'")
div(style="font-size:13px;position:absolute;right:0;z-index:1;margin-right:15px")
div(style="font-size:13px;position:absolute;display:flex;right:0;z-index:1;margin-right:15px")
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="bulkCopyFavoriteSelection") {{ $t('view.favorite.copy') }}
el-button(size="small" @click="showBulkUnfavoriteSelectionConfirm") {{ $t('view.favorite.bulk_unfavorite') }}
div(style="display:inline-block;margin-right:10px")
div(style="display:flex;align-items: center;margin-right:10px")
span.name {{ $t('view.favorite.edit_mode') }}
el-switch(v-model="editFavoritesMode" style="margin-left:5px")
el-tooltip(placement="bottom" :content="$t('view.favorite.refresh_tooltip')" :disabled="hideTooltips")
Expand Down Expand Up @@ -92,7 +92,7 @@ mixin favoritesTab()
template(slot="title")
div(style="display:flex;align-items:center;")
span(v-text="group.displayName ? group.displayName : group.name" style="font-weight:bold;font-size:14px;margin-left:10px")
el-tag(style="margin-left:5px" size="mini" :type="userFavoriteWorldsStatusForFavTab(group.visibility)" effect="plain") {{ group.visibility.charAt(0).toUpperCase() + group.visibility.slice(1) }}
el-tag(style="margin:1px 0 0 5px" size="mini" :type="userFavoriteWorldsStatusForFavTab(group.visibility)" effect="plain") {{ group.visibility.charAt(0).toUpperCase() + group.visibility.slice(1) }}
span(style="color:#909399;font-size:12px;margin-left:10px") {{ group.count }}/{{ group.capacity }}
el-tooltip(placement="top" :content="$t('view.favorite.visibility_tooltip')" :disabled="hideTooltips")
el-dropdown(trigger="click" @click.native.stop size="mini" style="margin-left:10px")
Expand Down
2 changes: 1 addition & 1 deletion html/src/mixins/tabs/feed.pug
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mixin feedTab()
data-tables(v-bind="feedTable" v-loading="feedTable.loading")
template(#tool)
div(style="margin:0 0 10px;display:flex;align-items:center")
div(style="flex:none;margin-right:10px")
div(style="flex:none;margin-right:10px;display:flex;align-items:center;")
el-tooltip(placement="bottom" :content="$t('view.feed.favorites_only_tooltip')" :disabled="hideTooltips")
el-switch(v-model="feedTable.vip" @change="feedTableLookup" active-color="#13ce66")
el-select(v-model="feedTable.filter" @change="feedTableLookup" multiple clearable style="flex:1;height:40px;" :placeholder="$t('view.feed.filter_placeholder')")
Expand Down
2 changes: 1 addition & 1 deletion html/src/mixins/tabs/friendsList.pug
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mixin friendsListTab()
el-tooltip(placement="top" :content="$t('view.friend_list.load_tooltip')" :disabled="hideTooltips")
el-button(@click="friendsListLoadUsers" size="mini" icon="el-icon-refresh-left" circle style="margin-left:5px")
div(style="margin:10px 0 0 10px;display:flex;align-items:center")
div(style="flex:none;margin-right:10px")
div(style="flex:none;margin-right:10px;display:flex;align-items:center;")
el-tooltip(placement="bottom" :content="$t('view.friend_list.favorites_only_tooltip')" :disabled="hideTooltips")
el-switch(v-model="friendsListSearchFilterVIP" @change="friendsListSearchChange" active-color="#13ce66")
el-input(v-model="friendsListSearch" :placeholder="$t('view.friend_list.search_placeholder')" @change="friendsListSearchChange" clearable style="flex:1")
Expand Down
2 changes: 1 addition & 1 deletion html/src/mixins/tabs/gameLog.pug
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mixin gameLogTab()
data-tables(v-bind="gameLogTable" v-loading="gameLogTable.loading")
template(#tool)
div(style="margin:0 0 10px;display:flex;align-items:center")
div(style="flex:none;margin-right:10px")
div(style="flex:none;margin-right:10px;display:flex;align-items:center;")
el-tooltip(placement="bottom" :content="$t('view.feed.favorites_only_tooltip')" :disabled="hideTooltips")
el-switch(v-model="gameLogTable.vip" @change="gameLogTableLookup" active-color="#13ce66")
el-select(v-model="gameLogTable.filter" @change="gameLogTableLookup" multiple clearable style="flex:1" :placeholder="$t('view.game_log.filter_placeholder')")
Expand Down
14 changes: 7 additions & 7 deletions html/src/mixins/tabs/profile.pug
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ mixin profileTab()
.detail
span.name {{ $t('view.profile.profile.v_bucks') }}
span.extra {{ API.currentUser.$vbucks ?? $t('view.profile.profile.refresh') }}
div
el-button(size="small" icon="el-icon-switch-button" @click="logout()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.logout') }}
el-button(size="small" icon="el-icon-picture-outline" @click="showGalleryDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.manage_gallery_icon') }}
el-button(size="small" icon="el-icon-printer" @click="showExportFriendsListDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.export_friend_list') }}
el-button(size="small" icon="el-icon-user" @click="showExportAvatarsListDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.export_own_avatars') }}
el-button(size="small" icon="el-icon-chat-dot-round" @click="showDiscordNamesDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.discord_names') }}
el-button(size="small" icon="el-icon-document-copy" @click="showNoteExportDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.export_notes') }}
div(style="margin-top:10px")
el-button(size="small" type="danger" plain icon="el-icon-switch-button" @click="logout()" style="margin-right:5px;background:#fef0f0 !important;border-color:#fbc4c4 !important;") {{ $t('view.profile.profile.logout') }}
el-button(size="small" icon="el-icon-picture-outline" @click="showGalleryDialog()" style="margin-right:5px") {{ $t('view.profile.profile.manage_gallery_icon') }}
el-button(size="small" icon="el-icon-printer" @click="showExportFriendsListDialog()" style="margin-right:5px") {{ $t('view.profile.profile.export_friend_list') }}
el-button(size="small" icon="el-icon-user" @click="showExportAvatarsListDialog()" style="margin-right:5px") {{ $t('view.profile.profile.export_own_avatars') }}
el-button(size="small" icon="el-icon-chat-dot-round" @click="showDiscordNamesDialog()" style="margin-right:5px") {{ $t('view.profile.profile.discord_names') }}
el-button(size="small" icon="el-icon-document-copy" @click="showNoteExportDialog()" style="margin-right:5px") {{ $t('view.profile.profile.export_notes') }}
div.options-container
span.header {{ $t('view.profile.game_info.header') }}
.x-friend-list(style="margin-top:10px")
Expand Down
7 changes: 5 additions & 2 deletions html/src/mixins/tabs/settings.pug
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,11 @@ mixin settingsTab()
span.name {{ $t('view.settings.notifications.notifications.text_to_speech.use_memo_nicknames') }}
el-switch(v-model="notificationTTSNickName" @change="saveOpenVROption" :disabled="notificationTTS === 'Never'")
div.options-container-item
el-input(type="textarea" v-model="notificationTTSTest" :placeholder="$t('view.settings.notifications.notifications.text_to_speech.tts_test_placeholder')" :rows="1" style="width:175px;display:inline-block")
el-button(size="small" icon="el-icon-video-play" @click="testNotificationTTS") {{ $t('view.settings.notifications.notifications.text_to_speech.play') }}
span.name {{ $t('view.settings.notifications.notifications.text_to_speech.tts_test_placeholder') }}
el-switch(v-model="isTestTTSVisible")
div(v-if="isTestTTSVisible" style="margin-top:5px")
el-input(type="textarea" v-model="notificationTTSTest" :placeholder="$t('view.settings.notifications.notifications.text_to_speech.tts_test_placeholder')" :rows="1" style="width:175px;display:inline-block")
el-button(size="small" icon="el-icon-video-play" @click="testNotificationTTS" style="margin-top:5px") {{ $t('view.settings.notifications.notifications.text_to_speech.play') }}
//- Wrist Overlay Tab
el-tab-pane(:label="$t('view.settings.category.wrist_overlay')")
//- Wrist Overlay | SteamVR Wrist Overlay
Expand Down

1 comment on commit 20964f7

@Map1en
Copy link
Contributor Author

@Map1en Map1en commented on 20964f7 Dec 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

html/src/mixins/tabs/profile.pug
In other themes, there may be issues on line 25, which is related to overriding the element-ui styles. However, I haven't identified where the override is needed yet, and such overrides should not be necessary, so there might be temporary issues.

Please sign in to comment.