From 0422aeb7ab8afb0a88e4cf0e25f8e6eb064560e6 Mon Sep 17 00:00:00 2001 From: neatchee Date: Sat, 4 Jan 2025 01:37:38 -0800 Subject: [PATCH] Fixup leftover CSS references to glitch-soc's now-removed collapsed post feature, in favor of the upstream version --- .../glitch/styles/mastodon-gekka/diff.scss | 2 +- .../glitch/styles/mastodon-holiday/diff.scss | 2 +- .../styles/mastodon-rose-pine/diff.scss | 2 +- .../glitch/styles/mastodon-sakura/diff.scss | 2 +- .../glitch/styles/modern-glitch-fixes.scss | 22 ++++++++++---- .../glitch/styles/modern-urusai-fixes.scss | 30 +++++++++---------- .../flavours/glitch/styles/urusai-fixes.scss | 4 --- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/mastodon-gekka/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-gekka/diff.scss index b8e058b671f9fd..8895f6470aaa09 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-gekka/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-gekka/diff.scss @@ -629,7 +629,7 @@ html { } } -.status.collapsed .status__content::after { +.status__content .status__content.status__content--collapsed::after { background: linear-gradient( rgba(color.adjust($ui-base-color, $lightness: 13%), 0), rgba(color.adjust($ui-base-color, $lightness: 13%), 1) diff --git a/app/javascript/flavours/glitch/styles/mastodon-holiday/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-holiday/diff.scss index b8e058b671f9fd..8895f6470aaa09 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-holiday/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-holiday/diff.scss @@ -629,7 +629,7 @@ html { } } -.status.collapsed .status__content::after { +.status__content .status__content.status__content--collapsed::after { background: linear-gradient( rgba(color.adjust($ui-base-color, $lightness: 13%), 0), rgba(color.adjust($ui-base-color, $lightness: 13%), 1) diff --git a/app/javascript/flavours/glitch/styles/mastodon-rose-pine/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-rose-pine/diff.scss index b8e058b671f9fd..8895f6470aaa09 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-rose-pine/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-rose-pine/diff.scss @@ -629,7 +629,7 @@ html { } } -.status.collapsed .status__content::after { +.status__content .status__content.status__content--collapsed::after { background: linear-gradient( rgba(color.adjust($ui-base-color, $lightness: 13%), 0), rgba(color.adjust($ui-base-color, $lightness: 13%), 1) diff --git a/app/javascript/flavours/glitch/styles/mastodon-sakura/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-sakura/diff.scss index b8e058b671f9fd..8895f6470aaa09 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-sakura/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-sakura/diff.scss @@ -629,7 +629,7 @@ html { } } -.status.collapsed .status__content::after { +.status__content .status__content.status__content--collapsed::after { background: linear-gradient( rgba(color.adjust($ui-base-color, $lightness: 13%), 0), rgba(color.adjust($ui-base-color, $lightness: 13%), 1) diff --git a/app/javascript/flavours/glitch/styles/modern-glitch-fixes.scss b/app/javascript/flavours/glitch/styles/modern-glitch-fixes.scss index b9d065119baa98..0a8376a055b406 100644 --- a/app/javascript/flavours/glitch/styles/modern-glitch-fixes.scss +++ b/app/javascript/flavours/glitch/styles/modern-glitch-fixes.scss @@ -53,7 +53,9 @@ body.app-body.flavour-glitch > #mastodon .compose-form__submit button { padding: 10px 20px; } -body.app-body.flavour-glitch > #mastodon .collapsed .status__content { +body.app-body.flavour-glitch + > #mastodon + .status__content.stats__content--collapsed { height: auto !important; overflow: visible; mask: unset !important; @@ -61,8 +63,8 @@ body.app-body.flavour-glitch > #mastodon .collapsed .status__content { body.app-body.flavour-glitch > #mastodon - .collapsed .status__content + .status__content.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; @@ -71,23 +73,31 @@ body.app-body.flavour-glitch body.app-body.flavour-glitch > #mastodon - .collapsed .status__content + .status__content.status__content--collapsed p:not(:last-child) { margin-bottom: 0.4em; } -body.app-body.flavour-glitch > #mastodon .collapsed .status__content br { +body.app-body.flavour-glitch + > #mastodon + .status__content + .status__content.status__content--collapsed + br { display: block; } -body.app-body.flavour-glitch > #mastodon .collapsed .status__content::after { +body.app-body.flavour-glitch + > #mastodon + .status__content + .status__content.status__content--collapsed::after { content: unset; } body.app-body.flavour-glitch > #mastodon - .collapsed.muted + .muted + .status__content.status__content--collapsed .status__content__text ~ * { display: none; diff --git a/app/javascript/flavours/glitch/styles/modern-urusai-fixes.scss b/app/javascript/flavours/glitch/styles/modern-urusai-fixes.scss index 1ac63a5882ee69..09e605895f019a 100644 --- a/app/javascript/flavours/glitch/styles/modern-urusai-fixes.scss +++ b/app/javascript/flavours/glitch/styles/modern-urusai-fixes.scss @@ -19,16 +19,6 @@ body.app-body.flavour-glitch > #mastodon .notification__message > span, gap: unset !important; } -.status.collapsed .status__content { - max-height: unset !important; -} - -.status.collapsed .status__content .status__content__translate-button, -.status.collapsed .status__content .status-card, -.status.collapsed .status__content .video-player { - display: none; -} - body.app-body.flavour-glitch > #mastodon .reactions-bar button:not(.active) { background: color.adjust($ui-base-color, $lightness: 12%); } @@ -65,8 +55,7 @@ body.app-body.flavour-glitch body.app-body.flavour-glitch > #mastodon - .collapsed - .status__content + .status__content.status__content--collapsed p:not(:last-child) { margin-top: 0.4em; } @@ -76,10 +65,6 @@ body.app-body.flavour-glitch > #mastodon .compose-form__submit { margin-top: unset !important; } -body.app-body.flavour-glitch > #mastodon .collapsed .status__content { - padding: 12px 14px !important; -} - @media (width <= 889px) { .tabs-bar__wrapper { top: -1px !important; @@ -116,3 +101,16 @@ body.app-body.flavour-glitch > #mastodon .notification-ungrouped { .notification-request { margin-top: 60px; } + +.status__content.status__content--collapsed { + .status__content__text { + overflow: hidden; + mask: linear-gradient(to bottom, #000 65%, transparent); + } + + .status__content__translate-button, + .status-card, + .video-player { + display: none; + } +} diff --git a/app/javascript/flavours/glitch/styles/urusai-fixes.scss b/app/javascript/flavours/glitch/styles/urusai-fixes.scss index 1f90e7d5281243..2f837b10e9480a 100644 --- a/app/javascript/flavours/glitch/styles/urusai-fixes.scss +++ b/app/javascript/flavours/glitch/styles/urusai-fixes.scss @@ -2,10 +2,6 @@ width: 100% !important; } -.status__wrapper.collapsed .status__content { - overflow: visible !important; -} - .status__content--zoom-emojis-on-hover .emojione:hover { transform: scale(1.8); filter: drop-shadow(0 0 3px #0c0c0c);