e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

i apologize to all the cats that may have been harmed before this commit (#10342)

Browse source
This commit is contained in:
Freeplay 2023-06-21 14:22:04 -04:00
parent 49142df177
commit 7ed1cc1ff7
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/client/src/components/MkNote.vue
View file

@ -630,9 +630,10 @@ defineExpose({
.note-context { .note-context {
position: relative; position: relative;
z-index: 2;
padding: 0 32px 0 32px; padding: 0 32px 0 32px;
display: flex; display: flex;
background: var(--panel);
z-index: 1;
&:first-child { &:first-child {
margin-top: 20px; margin-top: 20px;
} }
@ -716,7 +717,8 @@ defineExpose({
> .article { > .article {
position: relative; position: relative;
overflow: clip; overflow: clip;
padding: 4px 32px 10px; padding: 20px 32px 10px;
margin-top: -16px;
&:first-child, &:first-child,
&:nth-child(2) { &:nth-child(2) {
@ -730,6 +732,8 @@ defineExpose({
.header-container { .header-container {
display: flex; display: flex;
position: relative;
z-index: 2;
> .avatar { > .avatar {
flex-shrink: 0; flex-shrink: 0;
display: block; display: block;

20
packages/client/src/components/MkSubNoteContent.vue
View file

@ -210,19 +210,13 @@ const emit = defineEmits<{
const cwButton = ref<HTMLElement>(); const cwButton = ref<HTMLElement>();
const showMoreButton = ref<HTMLElement>(); const showMoreButton = ref<HTMLElement>();
const isLong = !props.detailedView && props.note.cw == null && const isLong =
( !props.detailedView &&
( props.note.cw == null &&
props.note.text != null && ((props.note.text != null &&
( (props.note.text.split("\n").length > 10 ||
props.note.text.split("\n").length > 10 || props.note.text.length > 800)) ||
props.note.text.length > 800 props.note.files.length > 4);
)
) ||
props.note.files.length > 4
)
;
const collapsed = $ref(props.note.cw == null && isLong); const collapsed = $ref(props.note.cw == null && isLong);
const urls = props.note.text const urls = props.note.text