-
-
-
-
-
-
-
-
-
- {{ notification.from_profile.name }}
-
-
- {{ $t('notifications.favorited_you') }}
-
-
-
+
+
+
+
+
+
+
+
+
+
- {{ $t('notifications.repeated_you') }}
-
-
-
- {{ $t('notifications.followed_you') }}
-
-
+
+ {{ notification.from_profile.name }}
+
+
+ {{ $t('notifications.favorited_you') }}
+
+
+
+ {{ $t('notifications.repeated_you') }}
+
+
+
+ {{ $t('notifications.followed_you') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+ @{{ notification.from_profile.screen_name }}
-
-
-
- @{{ notification.from_profile.screen_name }}
-
+
+
+
-
-
-
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 622d12f4..71876b14 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -33,7 +33,6 @@
.notification {
box-sizing: border-box;
- display: flex;
border-bottom: 1px solid;
border-color: $fallback--border;
border-color: var(--border, $fallback--border);
@@ -47,6 +46,10 @@
}
}
+ .muted {
+ padding: .25em .6em;
+ }
+
.non-mention {
display: flex;
flex: 1;
From f8139e369c0ca4ae90cca78c5d1fee69b88375d6 Mon Sep 17 00:00:00 2001
From: taehoon
Date: Tue, 10 Sep 2019 16:21:52 -0400
Subject: [PATCH 2/2] wire up user state with global store
---
src/components/notification/notification.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 181f7715..8e817f3b 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -53,10 +53,10 @@ const Notification = {
return this.notification.from_profile
},
userProfileLink () {
- return this.generateUserProfileLink(this.notification.from_profile)
+ return this.generateUserProfileLink(this.user)
},
needMute () {
- return this.notification.from_profile.muted
+ return this.user.muted
}
}
}