From 30219098a6ba5ac5369f8c130676de7a7c8daea9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:31 +0300
Subject: fix issues with reply-link

---
 src/components/status/status.scss | 21 ++++++++++++++++++---
 src/components/status/status.vue  |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'src/components/status')

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 898e914f..7fbab3b8 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -133,6 +133,13 @@ $status-margin: 0.75em;
     margin-right: 0.5em;
     max-width: 100%;
 
+    .reply-to-link {
+      white-space: nowrap;
+      word-break: break-word;
+      text-overflow: ellipsis;
+      overflow-x: hidden;
+    }
+
     .icon-reply {
       // mirror the icon
       transform: scaleX(-1);
@@ -143,11 +150,20 @@ $status-margin: 0.75em;
   & .reply-to-no-popover {
     min-width: 0;
     margin-right: 0.4em;
+    flex-shrink: 0;
   }
 
   .reply-to-popover {
-    &:hover {
+    position: relative;
+
+    .reply-to:hover::before {
+      content: '';
+      display: block;
+      position: absolute;
+      bottom: 0;
+      width: 100%;
       border-bottom: 1px solid var(--faint);
+      pointer-events: none;
     }
 
     .faint-link:hover {
@@ -156,8 +172,6 @@ $status-margin: 0.75em;
     }
 
     &.-strikethrough {
-      position: relative;
-
       &::after {
         content: '';
         display: block;
@@ -165,6 +179,7 @@ $status-margin: 0.75em;
         top: 50%;
         width: 100%;
         border-bottom: 1px solid var(--faint);
+        pointer-events: none;
       }
     }
   }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 27af4340..282ad37d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -234,6 +234,7 @@
                   <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
                 </span>
                 <router-link
+                  class="reply-to-link"
                   :title="replyToName"
                   :to="replyProfileLink"
                 >
-- 
cgit v1.2.3-70-g09d2


From 815f230ac7ace5a1507afae91bafa57589a77522 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 23:57:42 +0300
Subject: fixed some issues related to user avatar

---
 src/components/attachment/attachment.vue          |  8 ++++++--
 src/components/chat_list_item/chat_list_item.scss |  2 +-
 src/components/chat_title/chat_title.vue          |  2 +-
 src/components/status/status.scss                 |  2 +-
 src/components/still-image/still-image.vue        |  3 +--
 src/components/user_avatar/user_avatar.vue        |  6 ++++--
 src/components/user_card/user_card.vue            | 10 +++-------
 7 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'src/components/status')

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index be7377e9..63e0ceba 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -60,6 +60,7 @@
       @click="openModal"
     >
       <StillImage
+        class="image"
         :referrerpolicy="referrerpolicy"
         :mimetype="attachment.mimetype"
         :src="attachment.large_thumb_url || attachment.url"
@@ -281,8 +282,11 @@
   }
 
   .image-attachment {
-    width: 100%;
-    height: 100%;
+    &,
+    & .image {
+      width: 100%;
+      height: 100%;
+    }
 
     &.hidden {
       display: none;
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index 10ba45f2..9e97b28e 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -72,7 +72,7 @@
     }
   }
 
-  .avatar.still-image {
+  .Avatar {
     border-radius: $fallback--avatarAltRadius;
     border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
   }
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index c375b10b..b16ed39d 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -51,7 +51,7 @@
     }
   }
 
-  .still-image.avatar {
+  .Avatar {
     width: 23px;
     height: 23px;
     margin-right: 0.5em;
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 7fbab3b8..4973e4ba 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -6,7 +6,7 @@ $status-margin: 0.75em;
 .Status {
   min-width: 0;
 
-  &:hover .avatar {
+  &:hover {
     --still-image-img: visible;
     --still-image-canvas: hidden;
   }
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 6fa055de..ad82210d 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -30,8 +30,6 @@
   position: relative;
   line-height: 0;
   overflow: hidden;
-  width: 100%;
-  height: 100%;
   display: flex;
   align-items: center;
 
@@ -68,6 +66,7 @@
       border-radius: $fallback--tooltipRadius;
       border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
       z-index: 2;
+      visibility: var(--still-image-label-visibility, visible);
     }
 
     &:hover canvas {
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 3545b801..e4e4127c 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -1,6 +1,6 @@
 <template>
   <StillImage
-    class="avatar"
+    class="Avatar"
     :alt="user.screen_name"
     :title="user.screen_name"
     :src="imgSrc(user.profile_image_url_original)"
@@ -13,7 +13,9 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.avatar.still-image {
+.Avatar {
+  --still-image-label-visibility: hidden;
+
   width: 48px;
   height: 48px;
   box-shadow: var(--avatarStatusShadow);
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 75db5db1..07fce79a 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -364,13 +364,9 @@
     }
   }
 
-  &:hover .animated.avatar {
-    canvas {
-      display: none;
-    }
-    img {
-      visibility: visible;
-    }
+  &:hover .avatar {
+    --still-image-img: visible;
+    --still-image-canvas: hidden;
   }
 
   &-avatar-link {
-- 
cgit v1.2.3-70-g09d2


From 36c9368ae5b70098c12f86de8e15a23dd5fbc264 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:18:52 +0300
Subject: fix reply popovers being too slim

---
 src/components/status/status.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/components/status')

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 4973e4ba..9d55bac3 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -154,7 +154,9 @@ $status-margin: 0.75em;
   }
 
   .reply-to-popover {
-    position: relative;
+    .reply-to {
+      position: relative;
+    }
 
     .reply-to:hover::before {
       content: '';
-- 
cgit v1.2.3-70-g09d2


From d7c42f146905a85a0ff0bad6da85090d5349acdd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:38:54 +0300
Subject: lint

---
 src/components/status/status.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/components/status')

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 9d55bac3..c558466b 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -154,10 +154,6 @@ $status-margin: 0.75em;
   }
 
   .reply-to-popover {
-    .reply-to {
-      position: relative;
-    }
-
     .reply-to:hover::before {
       content: '';
       display: block;
@@ -188,6 +184,7 @@ $status-margin: 0.75em;
 
   .reply-to {
     display: flex;
+    position: relative;
   }
 
   .reply-to-text {
-- 
cgit v1.2.3-70-g09d2


From 800047b81f4375577e7d7298409cea5bd751ea71 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 12:14:00 +0300
Subject: fixed

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

(limited to 'src/components/status')

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index c558466b..8d292d3f 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -170,7 +170,7 @@ $status-margin: 0.75em;
     }
 
     &.-strikethrough {
-      &::after {
+      .reply-to::after {
         content: '';
         display: block;
         position: absolute;
-- 
cgit v1.2.3-70-g09d2