diff --git a/html/src/app.scss b/html/src/app.scss index 9232ee52..16afdead 100644 --- a/html/src/app.scss +++ b/html/src/app.scss @@ -525,3 +525,10 @@ i.x-user-status.busy { .color-picker { font-size: 18px; } + +.disableToggleSwitch ul li label { + background-color: #fff !important; + color: #8cc4ff !important; + border-color: #8cc4ff !important; + cursor: not-allowed !important; +} diff --git a/html/src/index.pug b/html/src/index.pug index 43cb5a32..f45737e9 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -710,7 +710,7 @@ html div.options-container-item span.name When to display notifications: br - toggle-switch(:options="desktopToastToggleSwitchOption" group="desktopToastToggleSwitchOption" v-model="desktopToast" class="toggle-switch" :disabled="!openVR") + toggle-switch(:options="desktopToastToggleSwitchOption" group="desktopToastToggleSwitchOption" v-model="desktopToast" class="toggle-switch" :class="{ 'disableToggleSwitch': !openVR }" :disabled="!openVR") br span.sub-header TTS Options div.options-container-item diff --git a/html/src/vr.js b/html/src/vr.js index 596d64e2..011228af 100644 --- a/html/src/vr.js +++ b/html/src/vr.js @@ -1019,7 +1019,7 @@ speechSynthesis.getVoices(); text = `${noty.displayName} is now your friend`; break; case 'Unfriend': - text = `${noty.displayName} has unfriended you`; + text = `${noty.displayName} is no longer your friend`; break; case 'TrustLevel': text = `${noty.displayName} trust level is now ${noty.trustLevel}`; @@ -1097,7 +1097,7 @@ speechSynthesis.getVoices(); this.speak(`${noty.displayName} is now your friend`); break; case 'Unfriend': - this.speak(`${noty.displayName} has unfriended you`); + this.speak(`${noty.displayName} is no longer your friend`); break; case 'TrustLevel': this.speak(`${noty.displayName} trust level is now ${noty.trustLevel}`); @@ -1181,7 +1181,7 @@ speechSynthesis.getVoices(); AppApi.DesktopNotification(noty.displayName, 'has sent you a friend request', imageURL); break; case 'Unfriend': - AppApi.DesktopNotification(noty.displayName, 'has unfriended you', imageURL); + AppApi.DesktopNotification(noty.displayName, 'is no longer your friend', imageURL); break; case 'TrustLevel': AppApi.DesktopNotification(noty.displayName, `trust level is now ${noty.trustLevel}`, imageURL); diff --git a/html/src/vr.pug b/html/src/vr.pug index d3933861..e29b6b4b 100644 --- a/html/src/vr.pug +++ b/html/src/vr.pug @@ -204,7 +204,7 @@ html .detail span.extra span.time {{ feed.created_at | formatDate('HH:MI') }} - | #[span.name(v-text="feed.displayName")] has unfriended you + | #[span.name(v-text="feed.displayName")] is no longer your friend div(v-else-if="feed.type === 'DisplayName'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") .detail span.extra