From 693eb4b717e8e1e0ecd4c7c5e4e0fa9cbdd8541a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 16 Aug 2018 13:41:45 +0300
Subject: cleanup, updated broken favorites look + localization strings

---
 src/components/notifications/notifications.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/components/notifications/notifications.scss')

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 008530b4..09741060 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -58,6 +58,16 @@
   border-bottom-color: inherit;
   padding-left: 4px;
 
+  .broken-favorite {
+    border-radius: $fallback--tooltipRadius;
+    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+    color: $fallback--faint;
+    color: var(--faint, $fallback--faint);
+    background-color: $fallback--cAlertRed;
+    background-color: var(--cAlertRed, $fallback--cAlertRed);
+    padding: 2px .5em
+  }
+
   .avatar-compact {
     width: 32px;
     height: 32px;
-- 
cgit v1.2.3-70-g09d2


From 3ccea3442ec71bee8136886474b877526100ed70 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Aug 2018 20:05:12 +0300
Subject: fix custom emoji in username, fix gif avatar not being animated when
 hovering on the notification

---
 src/components/notifications/notifications.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/components/notifications/notifications.scss')

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 2bc71bfe..08557ea2 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -79,7 +79,7 @@
     }
   }
 
-  &:hover .animated.avatar {
+  &:hover .animated.avatar-compact {
     canvas {
       display: none;
     }
@@ -155,6 +155,13 @@
       max-width: 100%;
       text-overflow: ellipsis;
       white-space: nowrap;
+
+      img {
+        width: 14px;
+        height: 14px;
+        vertical-align: middle;
+        object-fit: contain
+      }
     }
     .timeago {
       float: right;
-- 
cgit v1.2.3-70-g09d2


From f9b0a959695359f6159c5e1507609aba56a34d8d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Aug 2018 20:08:21 +0300
Subject: removed style for rounding bottom part of notifications because
 there's now always "load more" footer

---
 src/components/notifications/notifications.scss | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/components/notifications/notifications.scss')

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 08557ea2..5881fbaa 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -211,15 +211,4 @@
       margin-bottom: 0.3em;
     }
   }
-
-  // ugly as heck
-  &:last-child {
-    border-bottom: none;
-    border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-    border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
-    .status-el {
-      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
-    }
-  }
 }
-- 
cgit v1.2.3-70-g09d2


From b97db4912dacca3cfcf91fc0843e631666a47d1c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Aug 2018 20:45:54 +0300
Subject: error display

---
 src/components/notifications/notifications.js   |  3 +++
 src/components/notifications/notifications.scss | 19 +++++++++++++++++++
 src/components/notifications/notifications.vue  |  5 ++++-
 src/modules/statuses.js                         |  3 ++-
 4 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'src/components/notifications/notifications.scss')

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 55a9b0ab..b24250b0 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -14,6 +14,9 @@ const Notifications = {
     notifications () {
       return this.$store.state.statuses.notifications.data
     },
+    error () {
+      return this.$store.state.statuses.notifications.error
+    },
     unseenNotifications () {
       return filter(this.notifications, ({seen}) => !seen)
     },
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 5881fbaa..5b09685b 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -4,6 +4,10 @@
   // a bit of a hack to allow scrolling below notifications
   padding-bottom: 15em;
 
+  .title {
+    display: inline-block;
+  }
+
   .panel {
     background: $fallback--bg;
     background: var(--bg, $fallback--bg)
@@ -22,6 +26,8 @@
     background: var(--btn, $fallback--btn);
     color: $fallback--fg;
     color: var(--fg, $fallback--fg);
+    display: flex;
+    align-items: baseline;
     .read-button {
       position: absolute;
       right: 0.7em;
@@ -44,6 +50,19 @@
     line-height: 1.3em;
   }
 
+  .loadmore-error {
+    position: absolute;
+    right: 0.6em;
+    font-size: 14px;
+    min-width: 6em;
+    font-family: sans-serif;
+    text-align: center;
+    padding: 0 0.25em 0 0.25em;
+    margin: 0;
+    color: $fallback--fg;
+    color: var(--fg, $fallback--fg);
+  }
+
   .unseen {
     box-shadow: inset 4px 0 0 var(--cRed, $fallback--cRed);
     padding-left: 0;
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 859730ed..a0b0e5f5 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -3,7 +3,10 @@
     <div class="panel panel-default">
       <div class="panel-heading">
         <span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span>
-        {{$t('notifications.notifications')}}
+        <div class="title"> {{$t('notifications.notifications')}}</div>
+        <div @click.prevent class="loadmore-error alert error" v-if="error">
+          {{$t('timeline.error_fetching')}}
+        </div>
         <button v-if="unseenCount" @click.prevent="markAsSeen" class="read-button">{{$t('notifications.read')}}</button>
       </div>
       <div class="panel-body">
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 063f5f9c..8e1e7fe7 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -29,6 +29,7 @@ export const defaultState = {
     maxSavedId: 0,
     minId: Number.POSITIVE_INFINITY,
     data: [],
+    error: false,
     brokenFavorites: {}
   },
   favorites: new Set(),
@@ -364,7 +365,7 @@ export const mutations = {
     state.error = value
   },
   setNotificationsError (state, { value }) {
-    state.notificationsError = value
+    state.notifications.error = value
   },
   setNotificationsSilence (state, { value }) {
     state.notifications.desktopNotificationSilence = value
-- 
cgit v1.2.3-70-g09d2