Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Show actual status in notifications when mentioned."

Browse source 
This reverts commit 0e1ab69c33.
This commit is contained in:
Roger Braun 2017-02-23 00:26:37 +01:00
parent 7c0f3ea666
commit 74931dece7
5 changed files with 53 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/conversation/conversation.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div class="timeline panel panel-default base00-background conversation"> <div class="timeline panel panel-default base00-background">
<div class="panel-heading base01-background base04"> <div class="panel-heading base01-background base04">
Conversation Conversation
<div v-if="collapsable"> <div v-if="collapsable">

4
src/components/notifications/notifications.js
View file

@ -1,5 +1,4 @@
import { sortBy, take, filter } from 'lodash' import { sortBy, take, filter } from 'lodash'
import Status from '../status/status.vue'
const Notifications = { const Notifications = {
data () { data () {
@ -7,9 +6,6 @@ const Notifications = {
visibleNotificationCount: 10 visibleNotificationCount: 10
} }
}, },
components: {
Status
},
computed: { computed: {
notifications () { notifications () {
return this.$store.state.statuses.notifications return this.$store.state.statuses.notifications

16
src/components/notifications/notifications.scss
View file

@ -1,16 +1,8 @@
@import '../../_variables.scss'; @import '../../_variables.scss';
.notification { .notification {
border-bottom: 1px solid silver;
.notification-base {
padding: 0.4em 0 0 0.7em; padding: 0.4em 0 0 0.7em;
display: flex; display: flex;
.avatar { border-bottom: 1px solid silver;
padding-top: 0.3em;
width: 32px;
height: 32px;
border-radius: 50%;
}
.text { .text {
min-width: 0px; min-width: 0px;
@ -39,6 +31,12 @@
margin-bottom: 0.3em; margin-bottom: 0.3em;
} }
} }
.avatar {
padding-top: 0.3em;
width: 32px;
height: 32px;
border-radius: 50%;
} }
&:last-child { &:last-child {

4
src/components/notifications/notifications.vue
View file

@ -4,7 +4,6 @@
<div class="panel-heading base01-background base04">Notifications ({{unseenCount}}) <button @click.prevent="markAsSeen">Read!</button></div> <div class="panel-heading base01-background base04">Notifications ({{unseenCount}}) <button @click.prevent="markAsSeen">Read!</button></div>
<div class="panel-body"> <div class="panel-body">
<div v-for="notification in visibleNotifications" class="notification" :class='{"base01-background": notification.seen}'> <div v-for="notification in visibleNotifications" class="notification" :class='{"base01-background": notification.seen}'>
<div class="notification-base">
<a :href="notification.action.user.statusnet_profile_url"> <a :href="notification.action.user.statusnet_profile_url">
<img class='avatar' :src="notification.action.user.profile_image_url_original"> <img class='avatar' :src="notification.action.user.profile_image_url_original">
</a> </a>
@ -20,11 +19,10 @@
</div> </div>
<div v-if="notification.type === 'mention'"> <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 }}<br><i class="fa icon-reply"></i> <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">mentioned</router-link> you</h1>
<p>{{ notification.status.text }}</p>
</div> </div>
</div> </div>
</div> </div>
<status v-if="notification.type === 'mention'" :statusoid="notification.action" :expandable="false"></status>
</div>
</div> </div>
</div> </div>
</div> </div>

10
src/components/status/status.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div class="status-el base00-background" v-if="!status.deleted"> <div class="status-el base00-background" v-if="!status.deleted" v-bind:class="{ 'expanded-status': !expandable }">
<template v-if="muted"> <template v-if="muted">
<div class="media status container muted"> <div class="media status container muted">
<small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small> <small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small>
@ -121,6 +121,10 @@
} }
} }
.expanded-status {
border-left: 4px solid rgba(255, 48, 16, 0.65);
}
.status-actions { .status-actions {
padding-top: 5px; padding-top: 5px;
} }
@ -156,8 +160,4 @@
border-radius: 1em; border-radius: 1em;
margin-bottom: 1em; margin-bottom: 1em;
} }
.conversation .status-el {
border-left: 4px solid rgba(255, 48, 16, 0.65);
}
</style> </style>