diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-13 18:17:50 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-13 18:17:50 +0000 |
| commit | 55c481808477fdbc4c56edf22e27336b5e27d3fb (patch) | |
| tree | a6d3f9dae93c58ba26a8a5c02c61e1fbd59da228 /src/components/notifications/notifications.vue | |
| parent | 024b9ca724c90f8ab9ed573a553349e4002b7b95 (diff) | |
| parent | a169abcec25a85e0104cd00ef0db10939ef5d6fc (diff) | |
Merge branch 'fix/scrollbar-for-taller-posts' into 'develop'
Better handling of taller posts
Closes #40
See merge request pleroma/pleroma-fe!158
Diffstat (limited to 'src/components/notifications/notifications.vue')
| -rw-r--r-- | src/components/notifications/notifications.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index dfc7b0c9..1e5f6975 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -20,7 +20,8 @@ <i class="fa icon-star"></i> <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> </h1> - <div v-html="notification.status.statusnet_html"></div> + <div class="notification-gradient" :style="hiderStyle"></div> + <div class="notification-content" v-html="notification.status.statusnet_html"></div> </div> <div v-if="notification.type === 'repeat'"> <h1> @@ -28,7 +29,8 @@ <i class="fa icon-retweet lit"></i> <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> </h1> - <div v-html="notification.status.statusnet_html"></div> + <div class="notification-gradient" :style="hiderStyle"></div> + <div class="notification-content" v-html="notification.status.statusnet_html"></div> </div> <div v-if="notification.type === 'mention'"> <h1> |