From 265bcf54b08c8943e8589ab28e9ad8efec3512e4 Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Sat, 30 Dec 2023 23:14:00 +0100
Subject: [PATCH] upd: remove collapsed mentions
Glitchy/Broken CSS - Won't get any fixes by free so it is best to just undo the change
Closes #279
Closes #278
---
.../frontend/src/components/MkMention.vue | 42 -------------------
.../global/MkMisskeyFlavoredMarkdown.ts | 8 +---
2 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/packages/frontend/src/components/MkMention.vue b/packages/frontend/src/components/MkMention.vue
index 3aaf73683f..4d42053657 100644
--- a/packages/frontend/src/components/MkMention.vue
+++ b/packages/frontend/src/components/MkMention.vue
@@ -57,48 +57,6 @@ const avatarUrl = computed(() => defaultStore.state.disableShowingAnimatedImages
}
}
-.root + .root {
- position: relative;
- margin-inline: -20px 0;
- box-shadow: -4px 0 0 var(--panel), -15px 0 15px var(--panel);
- overflow: clip;
- isolation: isolate;
-
- &::before {
- content: "";
- position: absolute;
- inset: 0;
- background: var(--panel);
- z-index: -1;
- }
-
- &::after {
- content: "";
- position: absolute;
- inset: 0;
- background: var(--panel);
- z-index: -1;
- background: inherit;
- }
-
- span {
- display: inline-block;
- white-space: nowrap;
- max-width: 3em;
- mask: linear-gradient(to right, #000 20%, rgba(0, 0, 0, 0.4));
- }
-
- + .root {
- margin-inline: -10px 0;
- padding-inline-end: 0;
- box-shadow: -4px 0 0 var(--panel);
-
- span {
- display: none;
- }
- }
-}
-
.icon {
width: 1.5em;
height: 1.5em;
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 5bac440a81..a3bfdf0bb4 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -88,13 +88,7 @@ export default function(props: MfmProps, context: SetupContext<MfmEvents>) {
res.push(t);
}
res.shift();
-
- // Don't wrap whitespaces in a span
- if (text === ' ') {
- return res;
- }
-
- return h('span', res);
+ return res;
} else {
return [text.replace(/\n/g, ' ')];
}