Merge latest Mastodon-Modern theme updates

neatchee · Jan 8, 2025 · 6b0e968 · 6b0e968
1 parent c7feff7
commit 6b0e968
Show file tree

Hide file tree

Showing 4 changed files with 655 additions and 510 deletions.
diff --git a/app/javascript/flavours/glitch/styles/modern-glitch-fixes.scss b/app/javascript/flavours/glitch/styles/modern-glitch-fixes.scss
@@ -55,7 +55,8 @@ body.app-body.flavour-glitch > #mastodon .compose-form__submit button {
 
 body.app-body.flavour-glitch
   > #mastodon
-  .status__content.stats__content--collapsed {
+  .status__content
+  .status__content--collapsed {
   height: auto !important;
   overflow: visible;
   mask: unset !important;
@@ -64,7 +65,7 @@ body.app-body.flavour-glitch
 body.app-body.flavour-glitch
   > #mastodon
   .status__content
-  .status__content.status__content--collapsed
+  .status__content--collapsed
   .status__content__text {
   mask: linear-gradient(to bottom, #000 50px, transparent) !important;
   -webkit-mask: linear-gradient(to bottom, #000 50px, transparent) !important;
@@ -74,72 +75,40 @@ body.app-body.flavour-glitch
 body.app-body.flavour-glitch
   > #mastodon
   .status__content
-  .status__content.status__content--collapsed
+  .status__content--collapsed
   p:not(:last-child) {
   margin-bottom: 0.4em;
 }
 
 body.app-body.flavour-glitch
   > #mastodon
   .status__content
-  .status__content.status__content--collapsed
+  .status__content--collapsed
   br {
   display: block;
 }
 
 body.app-body.flavour-glitch
   > #mastodon
   .status__content
-  .status__content.status__content--collapsed::after {
+  .status__content--collapsed::after {
   content: unset;
 }
 
 body.app-body.flavour-glitch
   > #mastodon
   .muted
-  .status__content.status__content--collapsed
+  .status__content--collapsed
   .status__content__text
   ~ * {
   display: none;
 }
-@media (pointer: coarse) {
-  body.app-body.flavour-glitch > #mastodon .status__info {
-    align-items: center;
-  }
-
-  body.app-body.flavour-glitch > #mastodon .status__info__icons {
-    height: auto;
-  }
-}
-
-body.app-body.flavour-glitch > #mastodon .status {
-  isolation: isolate;
-  overflow: hidden;
-}
-
-body.app-body.flavour-glitch > #mastodon .status__info {
-  pointer-events: none;
-}
-
-body.app-body.flavour-glitch > #mastodon .status__avatar,
-body.app-body.flavour-glitch > #mastodon .status__info__icons {
-  pointer-events: all;
-}
-
-body.app-body.flavour-glitch
-  > #mastodon
-  .status
-  > :not(.status__content, .status__line) {
-  position: relative;
-  z-index: 2;
-}
 
 body.app-body.flavour-glitch
   > #mastodon
-  .status:not(.status-direct)
-  > .status__content {
-  margin-block: -100px !important;
-  padding-block: 100px !important;
+  .focusable[tabindex]:not(.notification-ungrouped)
+  .full-width {
+  margin-inline: 0;
 }
 
 body.app-body.flavour-glitch