aboutsummaryrefslogtreecommitdiff
path: root/src/components/notifications
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2018-04-11 19:34:40 +0300
committershpuld <shp@cock.li>2018-04-11 19:34:40 +0300
commita1f6ef1dcac2e79c5a116705ca11d6e7e51ed89c (patch)
tree29adae381f962942683fe4f01952f56b2f33fdf0 /src/components/notifications
parent82ee24ec31ad89e82c6002fd0dc3593f47adfdb4 (diff)
Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein.
Diffstat (limited to 'src/components/notifications')
-rw-r--r--src/components/notifications/notifications.scss16
-rw-r--r--src/components/notifications/notifications.vue2
2 files changed, 4 insertions, 14 deletions
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 65ab7f5e..651be058 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -20,8 +20,8 @@
position: relative;
background: $fallback--btn;
background: var(--btn, $fallback--btn);
- color: $fallback--faint;
- color: var(--faint, $fallback--faint);
+ color: $fallback--fg;
+ color: var(--fg, $fallback--fg);
.read-button {
position: absolute;
right: 0.7em;
@@ -105,7 +105,7 @@
color: var($fallback--faint, --faint);
}
padding: 0;
- .status-content.media-body {
+ .media-body {
margin: 0;
}
}
@@ -200,13 +200,3 @@
border-bottom: none;
}
}
-
-.notification-content {
- max-height: 12em;
- overflow-y: hidden;
- //text-overflow: ellipsis;
-
- img {
- object-fit: contain;
- }
-}
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index f01234d3..4fa6e925 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -7,7 +7,7 @@
<button v-if="unseenCount" @click.prevent="markAsSeen" class="read-button">{{$t('notifications.read')}}</button>
</div>
<div class="panel-body">
- <div v-for="notification in visibleNotifications" :key="notification" class="notification" :class='{"unseen": !notification.seen}'>
+ <div v-for="notification in visibleNotifications" :key="notification.action.id" class="notification" :class='{"unseen": !notification.seen}'>
<notification :notification="notification"></notification>
</div>
</div>