therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

Browse source
This commit is contained in:
sadposter 2020-08-13 20:15:30 +01:00
commit 763d2c0ce4
32 changed files with 2290 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/status_content/status_content.vue
View file

@ -1,6 +1,6 @@
<template>
<!-- eslint-disable vue/no-v-html -->
<div class="status-body">
<div class="StatusContent">
<slot name="header" />
<div
v-if="status.summary_html"
@ -133,7 +133,7 @@
$status-margin: 0.75em;
.status-body {
.StatusContent {
flex: 1;
min-width: 0;
@ -275,6 +275,7 @@ $status-margin: 0.75em;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
height: 1.4em;
}
}
}
@ -283,13 +284,4 @@ $status-margin: 0.75em;
color: $fallback--cGreen;
color: var(--postGreentext, $fallback--cGreen);
}
.timeline :not(.panel-disabled) > {
.status-el:last-child {
border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
border-bottom: none;
}
}
</style>