From 88fbbb5e9bc0f34ab265a4af3151cc96b0b00f0e Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 1 Mar 2020 09:47:21 +0100
Subject: status.vue: Add support for favicons

Put in replacement to the external icon when possible
---
 src/components/status/status.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/components/status/status.vue')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ca295640..ec32b60c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -150,8 +150,18 @@
                   class="source_url"
                   title="Source"
                 >
-                  <i class="button-icon icon-link-ext-alt" />
+                  <img
+                    height="18px"
+                    v-if="!!(status.user && status.user.favicon)"
+                    :src="status.user.favicon"
+                  />
+                  <i v-else class="button-icon icon-link-ext-alt" />
                 </a>
+                <img
+                  v-else-if="!!(status.user && status.user.favicon)"
+                  height="18px"
+                  :src="status.user.favicon"
+                />
                 <template v-if="expandable && !isPreview">
                   <a
                     href="#"
-- 
cgit v1.2.3-70-g09d2


From 6d2befa452d6b42e47968f382a7ff62d4eb0d9b9 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 16:47:32 +0300
Subject: move favicon to name

---
 src/components/status/status.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/components/status/status.vue')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ec32b60c..a4d12e3e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -121,6 +121,11 @@
                   :to="userProfileLink"
                 >
                   {{ status.user.screen_name }}
+                  <img
+                    height="18px"
+                    v-if="!!(status.user && status.user.favicon)"
+                    :src="status.user.favicon"
+                  >
                 </router-link>
               </div>
 
@@ -154,14 +159,14 @@
                     height="18px"
                     v-if="!!(status.user && status.user.favicon)"
                     :src="status.user.favicon"
-                  />
+                  >
                   <i v-else class="button-icon icon-link-ext-alt" />
                 </a>
                 <img
                   v-else-if="!!(status.user && status.user.favicon)"
                   height="18px"
                   :src="status.user.favicon"
-                />
+                >
                 <template v-if="expandable && !isPreview">
                   <a
                     href="#"
-- 
cgit v1.2.3-70-g09d2


From c4340ad46786cef557a2cc11d1248fcfef16d366 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 17:09:30 +0300
Subject: move favicon

---
 src/components/status/status.vue | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'src/components/status/status.vue')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0afb67fd..88be3c0c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -142,12 +142,12 @@
                   :to="userProfileLink"
                 >
                   {{ status.user.screen_name }}
-                  <img
-                    height="18px"
-                    v-if="!!(status.user && status.user.favicon)"
-                    :src="status.user.favicon"
-                  >
                 </router-link>
+                <img
+                  class="status-favicon"
+                  v-if="!!(status.user && status.user.favicon)"
+                  :src="status.user.favicon"
+                >
               </div>
 
               <span class="heading-right">
@@ -176,18 +176,8 @@
                   class="source_url"
                   title="Source"
                 >
-                  <img
-                    height="18px"
-                    v-if="!!(status.user && status.user.favicon)"
-                    :src="status.user.favicon"
-                  >
-                  <i v-else class="button-icon icon-link-ext-alt" />
+                  <i class="button-icon icon-link-ext-alt" />
                 </a>
-                <img
-                  v-else-if="!!(status.user && status.user.favicon)"
-                  height="18px"
-                  :src="status.user.favicon"
-                >
                 <template v-if="expandable && !isPreview">
                   <a
                     href="#"
@@ -441,6 +431,12 @@ $status-margin: 0.75em;
     }
   }
 
+  .status-favicon {
+    height: 18px;
+    width: 18px;
+    margin-right: 0.4em;
+  }
+
   .media-heading {
     padding: 0;
     vertical-align: bottom;
-- 
cgit v1.2.3-70-g09d2

