Merge branch 'develop' into mfm-on-hover

Merge pull request 'Don't render inline quote policy links in akkoma-fe' (#122 ) from eris/pleroma-fe:inline-quote-fix into develop
Reviewed-on: AkkomaGang/pleroma-fe#122 Reviewed-by: floatingghost <hannah@coffee-and-dreams.uk>
2022-08-07 20:27:24 +00:00 · 2022-08-07 20:21:04 +00:00 · 2022-08-07 20:03:31 +00:00 · 2022-08-07 07:57:21 +00:00 · 2022-08-07 07:51:27 +00:00
2 changed files with 10 additions and 0 deletions
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@ -82,4 +82,10 @@
    }
  }
 }
+
+.quote-inline,
+.quote + .link-preview {
+  display: none;
+}
+
 </style>
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@ -51,6 +51,10 @@
    width: 100%;
    height: 100%;
    object-fit: contain;
+
+    &::before {
+      line-height: 20px;
+    }
  }

  &.animated {
Author	SHA1	Message	Date
eris	61bb9b50bc	Merge branch 'develop' into mfm-on-hover	2022-08-07 20:27:24 +00:00
floatingghost	b354ad382c	Merge pull request 'Don't render inline quote policy links in akkoma-fe' (#122 ) from eris/pleroma-fe:inline-quote-fix into develop Reviewed-on: AkkomaGang/pleroma-fe#122 Reviewed-by: floatingghost <hannah@coffee-and-dreams.uk>	2022-08-07 20:21:04 +00:00
floatingghost	863d586664	Merge pull request 'Fix alt text line height when image doesn't load' (#121 ) from eris/pleroma-fe:fix-alt-text into develop Reviewed-on: AkkomaGang/pleroma-fe#121	2022-08-07 20:03:31 +00:00
eris	92e0d885f0	Don't render inline quote policy links	2022-08-07 07:57:21 +00:00
eris	327195dc55	Fix alt text line height	2022-08-07 07:51:27 +00:00