aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShpuld Shpuldson <shpuld@gmail.com>2017-05-30 00:24:08 +0300
committerShpuld Shpuldson <shpuld@gmail.com>2017-05-30 00:24:08 +0300
commite621be1428f844a39fdb0bf44ff6d0f2af7ff253 (patch)
tree3849665e23aab4bfc68b0ffab09d94816064294c /src
parent32d1d2178a82fef48de2b8eebe911313c68c19a3 (diff)
Cut notification header length from 3 lines to 1.
Diffstat (limited to 'src')
-rw-r--r--src/components/notifications/notifications.scss4
-rw-r--r--src/components/notifications/notifications.vue23
2 files changed, 21 insertions, 6 deletions
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index c7c650a9..5619c2d8 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -54,10 +54,14 @@
}
h1 {
+ word-break: break-all;
margin: 0 0 0.3em;
padding: 0;
font-size: 1em;
line-height:20px;
+ small {
+ font-weight: lighter;
+ }
}
padding: 0.3em 0.8em 0.5em;
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index a326e9cd..9d9028ad 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -12,17 +12,28 @@
<img class='avatar' :src="notification.action.user.profile_image_url_original">
</a>
<div class='text'>
- <timeago :since="notification.action.created_at" :auto-update="240"></timeago>
<div v-if="notification.type === 'favorite'">
- <h1>{{ notification.action.user.name }}<br><i class="fa icon-star"></i> favorited your <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">status</router-link></h1>
- <p>{{ notification.status.text }}</p>
+ <h1>
+ {{ notification.action.user.name }}
+ <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>
+ <p>{{ notification.status.text }}</p>
</div>
<div v-if="notification.type === 'repeat'">
- <h1>{{ notification.action.user.name }}<br><i class="fa icon-retweet"></i> repeated your <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">status</router-link></h1>
- <p>{{ notification.status.text }}</p>
+ <h1>
+ {{ notification.action.user.name }}
+ <i class="fa icon-retweet"></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>
+ <p>{{ notification.status.text }}</p>
</div>
<div v-if="notification.type === 'mention'">
- <h1>{{ notification.action.user.name }}<br><i class="fa icon-reply"></i> <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">mentioned</router-link> you</h1>
+ <h1>
+ {{ notification.action.user.name }}
+ <i class="fa icon-reply"></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>
<p>{{ notification.status.text }}</p>
</div>
</div>