Mastodon: layout fix and poll notification
This commit is contained in:
parent
271dd81d9e
commit
cd19aa864f
|
@ -303,11 +303,13 @@ export default class Client extends Mixins<ServiceClient<Options>>(ServiceClient
|
||||||
.list
|
.list
|
||||||
@include group-tile
|
@include group-tile
|
||||||
flex-grow: 1
|
flex-grow: 1
|
||||||
|
overflow-y: scroll
|
||||||
.statues, .notifications, .context, .emoji-list
|
.statues, .notifications, .context, .emoji-list
|
||||||
flex-grow: 1
|
flex-grow: 1
|
||||||
display: flex
|
display: flex
|
||||||
flex-direction: column
|
flex-direction: column
|
||||||
overflow-y: auto
|
overflow: inherit
|
||||||
|
height: 100%
|
||||||
.ancestors, .descendants
|
.ancestors, .descendants
|
||||||
.status
|
.status
|
||||||
font-size: .9em
|
font-size: .9em
|
||||||
|
|
|
@ -9,7 +9,8 @@ export const Notification = {
|
||||||
mention: '✉',
|
mention: '✉',
|
||||||
reblog: '⟳',
|
reblog: '⟳',
|
||||||
favourite: '⚝',
|
favourite: '⚝',
|
||||||
follow: '👁'
|
follow: '👁',
|
||||||
|
poll: '✓'
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Icons = {
|
export const Icons = {
|
||||||
|
|
|
@ -1,16 +1,18 @@
|
||||||
<template lang="pug">
|
<template lang="pug">
|
||||||
.notification
|
.notification
|
||||||
|
|
||||||
account(:account="notification.account" :bus="bus")
|
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.colored.text-icon.letter {{ notificationTypeIcon }}
|
||||||
span.date {{ fromNow(notification.created_at) }}
|
|
||||||
|
|
||||||
.content
|
.content
|
||||||
template(v-if="notification.type == 'follow'") Vous suit
|
template(v-if="notification.type == 'follow'") Vous suit
|
||||||
status.reblog(v-else-if="notification.status" :status="notification.status"
|
status.reblog(v-else-if="notification.status" :status="notification.status"
|
||||||
:withAccount="notification.type != 'mention'" :bus="bus")
|
:withAccount="notification.type != 'mention'" :bus="bus")
|
||||||
|
|
||||||
a.date(@click.stop.prevent="makeDismiss" style="margin-top: -1em") {{ closeIcon }}
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
|
|
@ -103,7 +103,7 @@ export interface Context {
|
||||||
descendants: Status[]
|
descendants: Status[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export type NotificationType = 'follow' | 'mention' | 'reblog' | 'favourite'
|
export type NotificationType = 'follow' | 'mention' | 'reblog' | 'favourite' | 'poll'
|
||||||
export interface Notification {
|
export interface Notification {
|
||||||
id: number
|
id: number
|
||||||
account: Account
|
account: Account
|
||||||
|
|
Loading…
Reference in New Issue