From 5dc0cf168cbe9d706e093f7bea16a63bac4b6186 Mon Sep 17 00:00:00 2001 From: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com> Date: Tue, 11 Nov 2025 15:07:31 +0100 Subject: [PATCH 1/2] remove uppercase on various places --- .../ChannelDetails/ChannelDetails.vue | 20 +++++++++---------- .../FtSubscribeButton/FtSubscribeButton.vue | 2 +- .../watch-video-info/watch-video-info.js | 6 +++--- src/renderer/scss-partials/_ft-list-item.scss | 4 +--- .../views/Subscriptions/Subscriptions.css | 1 - src/renderer/views/Trending/Trending.vue | 8 ++++---- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/renderer/components/ChannelDetails/ChannelDetails.vue b/src/renderer/components/ChannelDetails/ChannelDetails.vue index a1aac34333e28..1ede9ae9a5e5e 100644 --- a/src/renderer/components/ChannelDetails/ChannelDetails.vue +++ b/src/renderer/components/ChannelDetails/ChannelDetails.vue @@ -88,7 +88,7 @@ @keydown.left.right="focusTab('home', $event)" @keydown.enter.space.prevent="changeTab('home')" > - {{ $t("Channel.Home.Home").toUpperCase() }} + {{ $t("Channel.Home.Home") }}
- {{ $t("Channel.Videos.Videos").toUpperCase() }} + {{ $t("Channel.Videos.Videos") }}
- {{ $t("Global.Shorts").toUpperCase() }} + {{ $t("Global.Shorts") }}
- {{ $t("Channel.Live.Live").toUpperCase() }} + {{ $t("Channel.Live.Live") }}
- {{ $t("Channel.Releases.Releases").toUpperCase() }} + {{ $t("Channel.Releases.Releases") }}
- {{ $t("Channel.Podcasts.Podcasts").toUpperCase() }} + {{ $t("Channel.Podcasts.Podcasts") }}
- {{ $t("Channel.Courses.Courses").toUpperCase() }} + {{ $t("Channel.Courses.Courses") }}
- {{ $t("Channel.Playlists.Playlists").toUpperCase() }} + {{ $t("Channel.Playlists.Playlists") }}
- {{ $t("Global.Posts").toUpperCase() }} + {{ $t("Global.Posts") }}
- {{ $t("Channel.About.About").toUpperCase() }} + {{ $t("Channel.About.About") }}
diff --git a/src/renderer/components/FtSubscribeButton/FtSubscribeButton.vue b/src/renderer/components/FtSubscribeButton/FtSubscribeButton.vue index 69448c834c8f4..bd4ee1a34ee1c 100644 --- a/src/renderer/components/FtSubscribeButton/FtSubscribeButton.vue +++ b/src/renderer/components/FtSubscribeButton/FtSubscribeButton.vue @@ -182,7 +182,7 @@ const hideChannelSubscriptions = computed(() => { }) const subscribedText = computed(() => { - let subscribedValue = (isProfileSubscribed(activeProfile.value) ? t('Channel.Unsubscribe') : t('Channel.Subscribe')).toUpperCase() + let subscribedValue = (isProfileSubscribed(activeProfile.value) ? t('Channel.Unsubscribe') : t('Channel.Subscribe')) if (props.subscriptionCountText !== '' && !hideChannelSubscriptions.value) { subscribedValue += ' ' + props.subscriptionCountText } diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js index db2d85a70ea09..44a97270ef86c 100644 --- a/src/renderer/components/watch-video-info/watch-video-info.js +++ b/src/renderer/components/watch-video-info/watch-video-info.js @@ -176,15 +176,15 @@ export default defineComponent({ formatTypeOptions: function () { return [ { - label: this.$t('Change Format.Use Dash Formats').toUpperCase(), + label: this.$t('Change Format.Use Dash Formats'), value: 'dash' }, { - label: this.$t('Change Format.Use Legacy Formats').toUpperCase(), + label: this.$t('Change Format.Use Legacy Formats'), value: 'legacy' }, { - label: this.$t('Change Format.Use Audio Formats').toUpperCase(), + label: this.$t('Change Format.Use Audio Formats'), value: 'audio' } ] diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss index 5b25e3e4ea926..0f67254aec1d2 100644 --- a/src/renderer/scss-partials/_ft-list-item.scss +++ b/src/renderer/scss-partials/_ft-list-item.scss @@ -388,9 +388,7 @@ $watched-transition-duration: 0.5s; } } -.videoWatched, -.live, -.upcoming { +.live { text-transform: uppercase; user-select: none; } diff --git a/src/renderer/views/Subscriptions/Subscriptions.css b/src/renderer/views/Subscriptions/Subscriptions.css index d726ba4bab68c..1882028a546ae 100644 --- a/src/renderer/views/Subscriptions/Subscriptions.css +++ b/src/renderer/views/Subscriptions/Subscriptions.css @@ -28,7 +28,6 @@ font-size: 1.1em; cursor: pointer; align-self: flex-end; - text-transform: uppercase; } .tab:hover { diff --git a/src/renderer/views/Trending/Trending.vue b/src/renderer/views/Trending/Trending.vue index 9cfd651520646..de3985c6248bf 100644 --- a/src/renderer/views/Trending/Trending.vue +++ b/src/renderer/views/Trending/Trending.vue @@ -35,7 +35,7 @@ class="trendingIcon" fixed-width /> - {{ $t("Trending.Default").toUpperCase() }} + {{ $t("Trending.Default") }}
- {{ $t("Trending.Music").toUpperCase() }} + {{ $t("Trending.Music") }}
- {{ $t("Trending.Gaming").toUpperCase() }} + {{ $t("Trending.Gaming") }}
- {{ $t("Trending.Movies").toUpperCase() }} + {{ $t("Trending.Movies") }}
Date: Tue, 11 Nov 2025 21:15:06 +0100 Subject: [PATCH 2/2] bring back user-select for upcoming and watched Co-Authored-By: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com> --- src/renderer/scss-partials/_ft-list-item.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss index 0f67254aec1d2..10726b438030d 100644 --- a/src/renderer/scss-partials/_ft-list-item.scss +++ b/src/renderer/scss-partials/_ft-list-item.scss @@ -388,9 +388,14 @@ $watched-transition-duration: 0.5s; } } +.videoWatched, +.live, +.upcoming { + user-select: none; +} + .live { text-transform: uppercase; - user-select: none; } // we use h3 for semantic reasons but don't want to keep the h3 style