Merge branch 'feature/mark_conversations_with_a_red_line' into 'develop'

Feature/mark conversations with a red line

See merge request !25
This commit is contained in:
lambadalambda 2017-02-21 04:23:13 -05:00
commit 842e15a314

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;
} }