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

fix red line in conversations

Browse source
This commit is contained in:
Shpuld Shpuldson 2020-09-04 12:09:19 +03:00
parent 785d1e79a1
commit eef21e9c0f
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,8 +60,8 @@
.conversation-status { .conversation-status {
border-color: $fallback--border; border-color: $fallback--border;
border-color: var(--border, $fallback--border); border-color: var(--border, $fallback--border);
border-left: 4px solid $fallback--cRed; border-left-color: $fallback--cRed;
border-left: 4px solid var(--cRed, $fallback--cRed); border-left-color: var(--cRed, $fallback--cRed);
} }
.conversation-status:last-child { .conversation-status:last-child {

5
src/components/status/status.scss
View file

@ -25,6 +25,11 @@ $status-margin: 0.75em;
--icon: var(--selectedPostIcon, $fallback--icon); --icon: var(--selectedPostIcon, $fallback--icon);
} }
&.-conversation {
border-left-width: 4px;
border-left-style: solid;
}
.status-container { .status-container {
display: flex; display: flex;
padding: $status-margin; padding: $status-margin;

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

@ -3,7 +3,7 @@
<div <div
v-if="!hideStatus" v-if="!hideStatus"
class="Status" class="Status"
:class="[{ '-focused': isFocused }, { 'status-conversation': inlineExpanded }]" :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]"
> >
<div <div
v-if="error" v-if="error"
@ -16,7 +16,7 @@
/> />
</div> </div>
<template v-if="muted && !isPreview"> <template v-if="muted && !isPreview">
<div class="status-csontainer muted"> <div class="status-container muted">
<small class="status-username"> <small class="status-username">
<i <i
v-if="muted && retweet" v-if="muted && retweet"