From cd19aa864fa6dc2a65b96871996080a92548dd18 Mon Sep 17 00:00:00 2001
From: shu <me@wadza.fr>
Date: Tue, 4 Jun 2019 16:02:42 +0200
Subject: [PATCH] Mastodon: layout fix and poll notification

---
 src/services/mastodon/Client.vue       | 4 +++-
 src/services/mastodon/Icons.ts         | 3 ++-
 src/services/mastodon/Notification.vue | 6 ++++--
 src/services/mastodon/Types.ts         | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/services/mastodon/Client.vue b/src/services/mastodon/Client.vue
index b85eb7f..5638bda 100644
--- a/src/services/mastodon/Client.vue
+++ b/src/services/mastodon/Client.vue
@@ -303,11 +303,13 @@ export default class Client extends Mixins<ServiceClient<Options>>(ServiceClient
     .list
       @include group-tile
       flex-grow: 1
+      overflow-y: scroll
     .statues, .notifications, .context, .emoji-list
       flex-grow: 1
       display: flex
       flex-direction: column
-      overflow-y: auto
+      overflow: inherit
+      height: 100%
     .ancestors, .descendants
       .status
         font-size: .9em
diff --git a/src/services/mastodon/Icons.ts b/src/services/mastodon/Icons.ts
index 2a8d6ac..6b83ace 100644
--- a/src/services/mastodon/Icons.ts
+++ b/src/services/mastodon/Icons.ts
@@ -9,7 +9,8 @@ export const Notification = {
   mention: '✉',
   reblog: '⟳',
   favourite: '⚝',
-  follow: '👁'
+  follow: '👁',
+  poll: '✓'
 }
 
 export const Icons = {
diff --git a/src/services/mastodon/Notification.vue b/src/services/mastodon/Notification.vue
index 590162e..84efa71 100644
--- a/src/services/mastodon/Notification.vue
+++ b/src/services/mastodon/Notification.vue
@@ -1,16 +1,18 @@
 <template lang="pug">
 .notification
+
   account(:account="notification.account" :bus="bus")
+  a.date
+    | {{ fromNow(notification.created_at) }}
+    span(@click.stop.prevent="makeDismiss") {{ closeIcon }}
 
   span.colored.text-icon.letter {{ notificationTypeIcon }}
-  span.date {{ fromNow(notification.created_at) }}
 
   .content
     template(v-if="notification.type == 'follow'") Vous suit
     status.reblog(v-else-if="notification.status" :status="notification.status"
       :withAccount="notification.type != 'mention'" :bus="bus")
 
-  a.date(@click.stop.prevent="makeDismiss" style="margin-top: -1em") {{ closeIcon }}
 </template>
 
 <script lang="ts">
diff --git a/src/services/mastodon/Types.ts b/src/services/mastodon/Types.ts
index 316bafb..3444023 100644
--- a/src/services/mastodon/Types.ts
+++ b/src/services/mastodon/Types.ts
@@ -103,7 +103,7 @@ export interface Context {
   descendants: Status[]
 }
 
-export type NotificationType = 'follow' | 'mention' | 'reblog' | 'favourite'
+export type NotificationType = 'follow' | 'mention' | 'reblog' | 'favourite' | 'poll'
 export interface Notification {
   id: number
   account: Account