From 079780a6594b953a342ec7530d332eb106aa7330 Mon Sep 17 00:00:00 2001 From: nileane Date: Sat, 31 Aug 2024 19:13:07 +0000 Subject: [PATCH] Copy CSS files to installation folder --- .../styles/tangerineui-cherry/tangerineui-cherry.scss | 11 ++--------- .../styles/tangerineui-lagoon/tangerineui-lagoon.scss | 11 ++--------- .../styles/tangerineui-purple/tangerineui-purple.scss | 11 ++--------- .../javascript/styles/tangerineui/tangerineui.scss | 11 ++--------- 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss index ad3a3f9..46d327f 100644 --- a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss +++ b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss @@ -2531,19 +2531,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu border-top: 1px solid var(--color-lines); border-bottom: 1px solid var(--color-lines); padding-bottom: 20px; + z-index: 1; box-shadow: inset 0 -5px var(--color-content-secondary-bg), inset 0 -6px var(--color-lines); } -.app-body .scrollable > div:first-child > .detailed-status__wrapper { /* Detailed post is first in column */ - border-top: 0; -} -.app-body .scrollable > div:last-child .detailed-status__wrapper:last-child { /* Detailed post is last in column */ - border-bottom: 1px solid var(--color-lines); - padding-bottom: 12px; - box-shadow: none; -} -.app-body .scrollable > div:only-child .detailed-status__wrapper:last-child { /* Detailed post is the only post in column */ +.app-body .scrollable > div:is(:last-child, :only-child) .detailed-status__wrapper:last-child { padding-bottom: 12px; box-shadow: none; } diff --git a/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss b/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss index e26c6c8..56b06c5 100644 --- a/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss +++ b/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss @@ -2531,19 +2531,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu border-top: 1px solid var(--color-lines); border-bottom: 1px solid var(--color-lines); padding-bottom: 20px; + z-index: 1; box-shadow: inset 0 -5px var(--color-content-secondary-bg), inset 0 -6px var(--color-lines); } -.app-body .scrollable > div:first-child > .detailed-status__wrapper { /* Detailed post is first in column */ - border-top: 0; -} -.app-body .scrollable > div:last-child .detailed-status__wrapper:last-child { /* Detailed post is last in column */ - border-bottom: 1px solid var(--color-lines); - padding-bottom: 12px; - box-shadow: none; -} -.app-body .scrollable > div:only-child .detailed-status__wrapper:last-child { /* Detailed post is the only post in column */ +.app-body .scrollable > div:is(:last-child, :only-child) .detailed-status__wrapper:last-child { padding-bottom: 12px; box-shadow: none; } diff --git a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss index 97c7f12..d519287 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss @@ -2531,19 +2531,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu border-top: 1px solid var(--color-lines); border-bottom: 1px solid var(--color-lines); padding-bottom: 20px; + z-index: 1; box-shadow: inset 0 -5px var(--color-content-secondary-bg), inset 0 -6px var(--color-lines); } -.app-body .scrollable > div:first-child > .detailed-status__wrapper { /* Detailed post is first in column */ - border-top: 0; -} -.app-body .scrollable > div:last-child .detailed-status__wrapper:last-child { /* Detailed post is last in column */ - border-bottom: 1px solid var(--color-lines); - padding-bottom: 12px; - box-shadow: none; -} -.app-body .scrollable > div:only-child .detailed-status__wrapper:last-child { /* Detailed post is the only post in column */ +.app-body .scrollable > div:is(:last-child, :only-child) .detailed-status__wrapper:last-child { padding-bottom: 12px; box-shadow: none; } diff --git a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss index f614f65..469fe89 100644 --- a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss +++ b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss @@ -2531,19 +2531,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu border-top: 1px solid var(--color-lines); border-bottom: 1px solid var(--color-lines); padding-bottom: 20px; + z-index: 1; box-shadow: inset 0 -5px var(--color-content-secondary-bg), inset 0 -6px var(--color-lines); } -.app-body .scrollable > div:first-child > .detailed-status__wrapper { /* Detailed post is first in column */ - border-top: 0; -} -.app-body .scrollable > div:last-child .detailed-status__wrapper:last-child { /* Detailed post is last in column */ - border-bottom: 1px solid var(--color-lines); - padding-bottom: 12px; - box-shadow: none; -} -.app-body .scrollable > div:only-child .detailed-status__wrapper:last-child { /* Detailed post is the only post in column */ +.app-body .scrollable > div:is(:last-child, :only-child) .detailed-status__wrapper:last-child { padding-bottom: 12px; box-shadow: none; }