From 1470b908950775bca3375081b8b91207a5c69751 Mon Sep 17 00:00:00 2001
From: Sai Karthik <kskarthik@disroot.org>
Date: Sat, 2 Jul 2022 22:23:15 +0530
Subject: [PATCH 1/3] refactor: align video info items responsively

---
 src/components/WatchVideo.vue | 86 +++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index ee7215ca..08eb0ad7 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -33,13 +33,17 @@
                     @seek="navigate"
                 />
             </div>
+            <!-- video title -->
             <div class="font-bold mt-2 text-2xl break-words" v-text="video.title" />
-
-            <div class="flex mb-1.5">
-                <span v-t="{ path: 'video.views', args: { views: addCommas(video.views) } }" />
-                <span class="ml-2" v-text="uploadDate" />
-
-                <div class="flex items-center relative ml-auto children:ml-2">
+            <div class="flex flex-wrap mt-3 mb-3">
+                <!-- views / date -->
+                <div class="flex flex-auto children:ml-2">
+                    <span v-t="{ path: 'video.views', args: { views: addCommas(video.views) } }" />
+                    <span> | </span>
+                    <span v-text="uploadDate" />
+                </div>
+                <!-- Likes/dilikes -->
+                <div class="flex children:mr-2">
                     <template v-if="video.likes >= 0">
                         <div>
                             <font-awesome-icon icon="thumbs-up" />
@@ -55,25 +59,9 @@
                             <strong v-t="'video.ratings_disabled'" />
                         </div>
                     </template>
-                    <a :href="`https://youtu.be/${getVideoId()}`" class="btn">
-                        <i18n-t keypath="player.watch_on" tag="strong">
-                            <font-awesome-icon class="mx-1.5" :icon="['fab', 'youtube']" />
-                        </i18n-t>
-                    </a>
-                    <a v-if="video.lbryId" :href="'https://odysee.com/' + video.lbryId" class="btn">
-                        <i18n-t keypath="player.watch_on" tag="strong">LBRY</i18n-t>
-                    </a>
-                    <router-link
-                        :to="toggleListenUrl"
-                        :aria-label="(isListening ? 'Watch ' : 'Listen to ') + video.title"
-                        :title="(isListening ? 'Watch ' : 'Listen to ') + video.title"
-                        class="btn"
-                    >
-                        <font-awesome-icon :icon="isListening ? 'tv' : 'headphones'" />
-                    </router-link>
                 </div>
             </div>
-
+            <!-- Channel info & options flex container -->
             <div class="flex">
                 <!-- Channel Image & Info -->
                 <div class="flex items-center">
@@ -83,17 +71,6 @@
                     }}</router-link>
                     <!-- Verified Badge -->
                     <font-awesome-icon class="ml-1" v-if="video.uploaderVerified" icon="check" />
-                    <!-- RSS Feed button -->
-                    <a
-                        aria-label="RSS feed"
-                        title="RSS feed"
-                        role="button"
-                        v-if="video.uploaderUrl"
-                        :href="`https://www.youtube.com/feeds/videos.xml?channel_id=${video.uploaderUrl.split('/')[2]}`"
-                        target="_blank"
-                    >
-                        <font-awesome-icon class="ml-3" icon="rss" />
-                    </a>
                 </div>
                 <div class="relative ml-auto children:mx-2">
                     <button class="btn" v-if="authenticated" @click="showModal = !showModal">
@@ -110,6 +87,47 @@
                     />
                 </div>
                 <PlaylistAddModal v-if="showModal" :video-id="getVideoId()" @close="showModal = !showModal" />
+                <div class="flex <lg:basis-7/12">
+                    <div class="self-center children:mr-1">
+                        <!-- RSS Feed button -->
+                        <a
+                            aria-label="RSS feed"
+                            title="RSS feed"
+                            role="button"
+                            v-if="video.uploaderUrl"
+                            :href="`https://www.youtube.com/feeds/videos.xml?channel_id=${
+                                video.uploaderUrl.split('/')[2]
+                            }`"
+                            target="_blank"
+                            class="btn flex-col"
+                        >
+                            <font-awesome-icon icon="rss" />
+                        </a>
+                        <!-- watch on youtube button -->
+                        <a :href="`https://youtu.be/${getVideoId()}`" class="btn <lg:hidden">
+                            <i18n-t keypath="player.watch_on" tag="strong">
+                                <font-awesome-icon class="mx-1.5" :icon="['fab', 'youtube']" />
+                            </i18n-t>
+                        </a>
+                        <!-- only visible on small screens -->
+                        <a :href="`https://youtu.be/${getVideoId()}`" class="btn sm:hidden">
+                            <font-awesome-icon class="mx-1.5" :icon="['fab', 'youtube']" />
+                        </a>
+                        <!-- LBRY -->
+                        <a v-if="video.lbryId" :href="'https://odysee.com/' + video.lbryId" class="btn">
+                            <i18n-t keypath="player.watch_on" tag="strong">LBRY</i18n-t>
+                        </a>
+                        <!-- listen / watch toggle -->
+                        <router-link
+                            :to="toggleListenUrl"
+                            :aria-label="(isListening ? 'Watch ' : 'Listen to ') + video.title"
+                            :title="(isListening ? 'Watch ' : 'Listen to ') + video.title"
+                            class="btn flex-col"
+                        >
+                            <font-awesome-icon :icon="isListening ? 'tv' : 'headphones'" />
+                        </router-link>
+                    </div>
+                </div>
             </div>
 
             <hr />

From b1158469aa249703b16b90d7497d9f54beec26be Mon Sep 17 00:00:00 2001
From: Sai Karthik <kskarthik@disroot.org>
Date: Sun, 3 Jul 2022 15:23:09 +0530
Subject: [PATCH 2/3] fix: don't truncate chapter titles in desktop view

---
 src/components/ChaptersBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ChaptersBar.vue b/src/components/ChaptersBar.vue
index 9dd09083..1b0f74c2 100644
--- a/src/components/ChaptersBar.vue
+++ b/src/components/ChaptersBar.vue
@@ -14,7 +14,7 @@
                 <span class="mt-5 mr-2 text-current" v-text="index + 1" />
                 <img :src="chapter.image" :alt="chapter.title" />
                 <div class="flex flex-col m-2">
-                    <span class="text-truncate text-sm" :title="chapter.title" v-text="chapter.title" />
+                    <span class="text-sm" :title="chapter.title" v-text="chapter.title" />
                     <span class="text-sm font-bold text-blue-500" v-text="timeFormat(chapter.start)" />
                 </div>
             </div>

From c8d09772e91aa4d43942666e8a0087eac245e705 Mon Sep 17 00:00:00 2001
From: Sai Karthik <kskarthik@disroot.org>
Date: Tue, 5 Jul 2022 11:38:50 +0530
Subject: [PATCH 3/3] fix: handle some shorts thumbnails misaligned due to
 length > 60 sec

---
 src/components/VideoItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue
index 90e27236..326a9a7b 100644
--- a/src/components/VideoItem.vue
+++ b/src/components/VideoItem.vue
@@ -176,7 +176,7 @@ export default {
     },
     computed: {
         short() {
-            return this.video.duration > 0 && this.video.duration <= 60;
+            return this.video.duration > 0 && this.video.duration <= 61;
         },
     },
     components: { PlaylistAddModal },