From 2fa050b1630e11efd1db17ad8d63a88ec7a9c8f9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:02 +0300
Subject: [PATCH 01/10] Fix muted notifications

---
 src/components/notification/notification.scss | 52 +++++++++++++++++++
 src/components/notification/notification.vue  |  3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 src/components/notification/notification.scss

diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
new file mode 100644
index 0000000000..d0e63d814f
--- /dev/null
+++ b/src/components/notification/notification.scss
@@ -0,0 +1,52 @@
+// TODO Copypaste from Status, should unify it somehow
+.Notification {
+  &.-muted {
+    padding: 0.25em 0.6em;
+    height: 1.2em;
+    line-height: 1.2em;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: nowrap;
+
+    & .status-username,
+    & .mute-thread,
+    & .mute-words {
+      word-wrap: normal;
+      word-break: normal;
+      white-space: nowrap;
+    }
+
+    & .status-username,
+    & .mute-words {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+
+    .status-username {
+      font-weight: normal;
+      flex: 0 1 auto;
+      margin-right: 0.2em;
+      font-size: smaller;
+    }
+
+    .mute-thread {
+      flex: 0 0 auto;
+    }
+
+    .mute-words {
+      flex: 1 0 5em;
+      margin-left: 0.2em;
+
+      &::before {
+        content: ' ';
+      }
+    }
+
+    .unmute {
+      flex: 0 0 auto;
+      margin-left: auto;
+      display: block;
+    }
+  }
+}
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 044ac87154..7fac384079 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -7,7 +7,7 @@
   <div v-else>
     <div
       v-if="needMute && !unmuted"
-      class="container muted"
+      class="Notification container -muted"
     >
       <small>
         <router-link :to="userProfileLink">
@@ -168,3 +168,4 @@
 </template>
 
 <script src="./notification.js"></script>
+<style src="./notification.scss" lang="scss"></style>

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: [PATCH 02/10] fix issues with reply-link

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

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 898e914f76..7fbab3b826 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 27af434061..282ad37dd6 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"
                 >

From ecbbec7b9798caff1d401403592de5ba02a3f509 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:44 +0300
Subject: [PATCH 03/10] work around incorrect styles ordering in status popover

---
 src/components/status_popover/status_popover.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index 79a52e3877..162eb21013 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -38,7 +38,8 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.status-popover {
+/* popover styles load on-demand, so we need to override */
+.status-popover.popover {
   font-size: 1rem;
   min-width: 15em;
   max-width: 95%;

From a6223cec0c6bb037f1e64a3bc7dfd7fca354faa1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:52:51 +0300
Subject: [PATCH 04/10] Fix last line having slightly cut-off low-hanging parts
 of characters

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e7094bec94..66252bdae9 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -481,7 +481,7 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const heightWithoutPadding = Math.floor(target.scrollHeight - vertPadding)
+      const heightWithoutPadding = Math.ceil(target.scrollHeight - vertPadding) + 1
       let newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
       // This is a bit of a hack to combat target.scrollHeight being different on every other input
       // on some browsers for whatever reason. Don't change the height if difference is 1px or less.

From 7de78b1401cf8454026afd0a2ba2578356173bcd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 23:50:23 +0300
Subject: [PATCH 05/10] revert change to form resize logic

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 66252bdae9..e7094bec94 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -481,7 +481,7 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const heightWithoutPadding = Math.ceil(target.scrollHeight - vertPadding) + 1
+      const heightWithoutPadding = Math.floor(target.scrollHeight - vertPadding)
       let newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
       // This is a bit of a hack to combat target.scrollHeight being different on every other input
       // on some browsers for whatever reason. Don't change the height if difference is 1px or less.

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: [PATCH 06/10] 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(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index be7377e955..63e0cebad2 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 10ba45f26c..9e97b28ea9 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 c375b10b48..b16ed39d74 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 7fbab3b826..4973e4ba29 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 6fa055de69..ad82210dcb 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 3545b8017f..e4e4127c19 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 75db5db17b..07fce79acb 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 {

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: [PATCH 07/10] fix reply popovers being too slim

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

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 4973e4ba29..9d55bac314 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: '';

From 61966d290ae87b9aadd530ef180fc191d75e77d2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:22:08 +0300
Subject: [PATCH 08/10] fix lain's bug

---
 src/components/post_status_form/post_status_form.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 7ee9e74847..520c03ea1e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -143,6 +143,7 @@
             v-model="newStatus.status"
             :placeholder="placeholder || $t('post_status.default')"
             rows="1"
+            cols="1"
             :disabled="posting"
             class="form-post-body"
             :class="{ 'scrollable-form': !!maxHeight }"

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: [PATCH 09/10] lint

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

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 9d55bac314..c558466b25 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 {

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: [PATCH 10/10] fixed

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

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index c558466b25..8d292d3f7a 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;