From 0bd3b563eb9a8c23dda4a7b850e478bf2191d6b6 Mon Sep 17 00:00:00 2001 From: nileane Date: Fri, 23 Aug 2024 14:23:24 +0000 Subject: [PATCH] Copy CSS files to installation folder --- .../tangerineui-cherry.scss | 74 +++++++++++-------- .../tangerineui-lagoon.scss | 74 +++++++++++-------- .../tangerineui-purple.scss | 74 +++++++++++-------- .../styles/tangerineui/tangerineui.scss | 74 +++++++++++-------- 4 files changed, 168 insertions(+), 128 deletions(-) diff --git a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss index 9579a25..076e2a1 100644 --- a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss +++ b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss @@ -2259,6 +2259,7 @@ body.app-body { .app-body .status__info .status__display-name { overflow: visible; align-items: start; + max-height: 22px; } .app-body .status__info .status__display-name .display-name bdi, .app-body .status__info .status__display-name .display-name__account { @@ -3024,27 +3025,38 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .app-body .status__content p:last-child { margin-bottom: 0; } -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) { - margin-bottom: 1px; -} -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) > span { - font-weight: bold; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)) > p:first-child:has(.status__content__spoiler-link) + div { - display: none; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)):has(> p:first-child .status__content__spoiler-link) + .media-gallery { - margin-top: 5px; -} -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link { - background-color: transparent; - width: 100%; - margin: -22px 0 0; - padding: 27px 0 5px; - text-align: start; +.app-body .content-warning { + background: none; + color: var(--color-content-fg); + margin-inline-start: 0; + margin-top: 2px; + border: 0; + padding: 0 0 30px; + font-weight: 700; + font-size: 15px; + line-height: 19px; position: relative; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { +.app-body .detailed-status .content-warning { + font-size: 19px; + line-height: 24px; +} +.app-body .content-warning::before, +.app-body .content-warning::after { + display: none; +} +.app-body .content-warning .link-button { + background-color: transparent; + width: 100%; + text-align: start; + position: absolute; + top: 0; + bottom: 0; + display: flex; + align-items: end; + text-decoration: none; +} +.app-body .content-warning .link-button span { background-color: transparent; background-image: var(--icon-eye-shut); background-repeat: no-repeat; @@ -3070,34 +3082,32 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu position: relative; z-index: 1; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { +.app-body .content-warning .link-button:hover span { border-color: rgba(68, 74, 90, .6); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:active span { +@media (prefers-color-scheme: dark) { + .app-body .content-warning .link-button:hover span { + border-color: rgba(255, 255, 255, .3); + } +} +.app-body .content-warning .link-button:active span { transform: scale(.95); } -.app-body :is(.reply-indicator__content, .status__content):has(> .status__content__text--visible) .status__content__spoiler-link span { +.app-body .content-warning:has(+ .status__content > .status__content__text--visible) .link-button span { background-image: var(--icon-eye-open); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { - color: var(--color-content-fg); -} @media (prefers-color-scheme: dark) { .app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { border-color: rgba(255, 255, 255, .3); } } + .app-body .icon-button.overlayed { - background-color: #ffffff; - color: #444b5d; - opacity: .6; - transition: opacity .3s; + background-color: rgba(0, 0, 0, .1); border-radius: 7px; } .app-body .icon-button.overlayed:hover { - background-color: #ffffff; - color: #444b5d; - opacity: 1; + background-color: rgba(0, 0, 0, .4); } .app-body .status__wrapper--filtered__button { color: var(--color-accent); diff --git a/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss b/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss index 1d72b6b..28ef02f 100644 --- a/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss +++ b/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss @@ -2259,6 +2259,7 @@ body.app-body { .app-body .status__info .status__display-name { overflow: visible; align-items: start; + max-height: 22px; } .app-body .status__info .status__display-name .display-name bdi, .app-body .status__info .status__display-name .display-name__account { @@ -3024,27 +3025,38 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .app-body .status__content p:last-child { margin-bottom: 0; } -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) { - margin-bottom: 1px; -} -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) > span { - font-weight: bold; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)) > p:first-child:has(.status__content__spoiler-link) + div { - display: none; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)):has(> p:first-child .status__content__spoiler-link) + .media-gallery { - margin-top: 5px; -} -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link { - background-color: transparent; - width: 100%; - margin: -22px 0 0; - padding: 27px 0 5px; - text-align: start; +.app-body .content-warning { + background: none; + color: var(--color-content-fg); + margin-inline-start: 0; + margin-top: 2px; + border: 0; + padding: 0 0 30px; + font-weight: 700; + font-size: 15px; + line-height: 19px; position: relative; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { +.app-body .detailed-status .content-warning { + font-size: 19px; + line-height: 24px; +} +.app-body .content-warning::before, +.app-body .content-warning::after { + display: none; +} +.app-body .content-warning .link-button { + background-color: transparent; + width: 100%; + text-align: start; + position: absolute; + top: 0; + bottom: 0; + display: flex; + align-items: end; + text-decoration: none; +} +.app-body .content-warning .link-button span { background-color: transparent; background-image: var(--icon-eye-shut); background-repeat: no-repeat; @@ -3070,34 +3082,32 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu position: relative; z-index: 1; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { +.app-body .content-warning .link-button:hover span { border-color: rgba(68, 74, 90, .6); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:active span { +@media (prefers-color-scheme: dark) { + .app-body .content-warning .link-button:hover span { + border-color: rgba(255, 255, 255, .3); + } +} +.app-body .content-warning .link-button:active span { transform: scale(.95); } -.app-body :is(.reply-indicator__content, .status__content):has(> .status__content__text--visible) .status__content__spoiler-link span { +.app-body .content-warning:has(+ .status__content > .status__content__text--visible) .link-button span { background-image: var(--icon-eye-open); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { - color: var(--color-content-fg); -} @media (prefers-color-scheme: dark) { .app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { border-color: rgba(255, 255, 255, .3); } } + .app-body .icon-button.overlayed { - background-color: #ffffff; - color: #444b5d; - opacity: .6; - transition: opacity .3s; + background-color: rgba(0, 0, 0, .1); border-radius: 7px; } .app-body .icon-button.overlayed:hover { - background-color: #ffffff; - color: #444b5d; - opacity: 1; + background-color: rgba(0, 0, 0, .4); } .app-body .status__wrapper--filtered__button { color: var(--color-accent); diff --git a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss index 5da9cd0..7057158 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss @@ -2259,6 +2259,7 @@ body.app-body { .app-body .status__info .status__display-name { overflow: visible; align-items: start; + max-height: 22px; } .app-body .status__info .status__display-name .display-name bdi, .app-body .status__info .status__display-name .display-name__account { @@ -3024,27 +3025,38 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .app-body .status__content p:last-child { margin-bottom: 0; } -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) { - margin-bottom: 1px; -} -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) > span { - font-weight: bold; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)) > p:first-child:has(.status__content__spoiler-link) + div { - display: none; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)):has(> p:first-child .status__content__spoiler-link) + .media-gallery { - margin-top: 5px; -} -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link { - background-color: transparent; - width: 100%; - margin: -22px 0 0; - padding: 27px 0 5px; - text-align: start; +.app-body .content-warning { + background: none; + color: var(--color-content-fg); + margin-inline-start: 0; + margin-top: 2px; + border: 0; + padding: 0 0 30px; + font-weight: 700; + font-size: 15px; + line-height: 19px; position: relative; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { +.app-body .detailed-status .content-warning { + font-size: 19px; + line-height: 24px; +} +.app-body .content-warning::before, +.app-body .content-warning::after { + display: none; +} +.app-body .content-warning .link-button { + background-color: transparent; + width: 100%; + text-align: start; + position: absolute; + top: 0; + bottom: 0; + display: flex; + align-items: end; + text-decoration: none; +} +.app-body .content-warning .link-button span { background-color: transparent; background-image: var(--icon-eye-shut); background-repeat: no-repeat; @@ -3070,34 +3082,32 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu position: relative; z-index: 1; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { +.app-body .content-warning .link-button:hover span { border-color: rgba(68, 74, 90, .6); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:active span { +@media (prefers-color-scheme: dark) { + .app-body .content-warning .link-button:hover span { + border-color: rgba(255, 255, 255, .3); + } +} +.app-body .content-warning .link-button:active span { transform: scale(.95); } -.app-body :is(.reply-indicator__content, .status__content):has(> .status__content__text--visible) .status__content__spoiler-link span { +.app-body .content-warning:has(+ .status__content > .status__content__text--visible) .link-button span { background-image: var(--icon-eye-open); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { - color: var(--color-content-fg); -} @media (prefers-color-scheme: dark) { .app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { border-color: rgba(255, 255, 255, .3); } } + .app-body .icon-button.overlayed { - background-color: #ffffff; - color: #444b5d; - opacity: .6; - transition: opacity .3s; + background-color: rgba(0, 0, 0, .1); border-radius: 7px; } .app-body .icon-button.overlayed:hover { - background-color: #ffffff; - color: #444b5d; - opacity: 1; + background-color: rgba(0, 0, 0, .4); } .app-body .status__wrapper--filtered__button { color: var(--color-accent); diff --git a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss index 3b891ef..21afbad 100644 --- a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss +++ b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss @@ -2259,6 +2259,7 @@ body.app-body { .app-body .status__info .status__display-name { overflow: visible; align-items: start; + max-height: 22px; } .app-body .status__info .status__display-name .display-name bdi, .app-body .status__info .status__display-name .display-name__account { @@ -3024,27 +3025,38 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .app-body .status__content p:last-child { margin-bottom: 0; } -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) { - margin-bottom: 1px; -} -.app-body .status__content > p:first-child:has(.status__content__spoiler-link) > span { - font-weight: bold; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)) > p:first-child:has(.status__content__spoiler-link) + div { - display: none; -} -.app-body :is(.reply-indicator__content, .status__content):not(:has(> .status__content__text--visible)):has(> p:first-child .status__content__spoiler-link) + .media-gallery { - margin-top: 5px; -} -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link { - background-color: transparent; - width: 100%; - margin: -22px 0 0; - padding: 27px 0 5px; - text-align: start; +.app-body .content-warning { + background: none; + color: var(--color-content-fg); + margin-inline-start: 0; + margin-top: 2px; + border: 0; + padding: 0 0 30px; + font-weight: 700; + font-size: 15px; + line-height: 19px; position: relative; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { +.app-body .detailed-status .content-warning { + font-size: 19px; + line-height: 24px; +} +.app-body .content-warning::before, +.app-body .content-warning::after { + display: none; +} +.app-body .content-warning .link-button { + background-color: transparent; + width: 100%; + text-align: start; + position: absolute; + top: 0; + bottom: 0; + display: flex; + align-items: end; + text-decoration: none; +} +.app-body .content-warning .link-button span { background-color: transparent; background-image: var(--icon-eye-shut); background-repeat: no-repeat; @@ -3070,34 +3082,32 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu position: relative; z-index: 1; } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { +.app-body .content-warning .link-button:hover span { border-color: rgba(68, 74, 90, .6); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:active span { +@media (prefers-color-scheme: dark) { + .app-body .content-warning .link-button:hover span { + border-color: rgba(255, 255, 255, .3); + } +} +.app-body .content-warning .link-button:active span { transform: scale(.95); } -.app-body :is(.reply-indicator__content, .status__content):has(> .status__content__text--visible) .status__content__spoiler-link span { +.app-body .content-warning:has(+ .status__content > .status__content__text--visible) .link-button span { background-image: var(--icon-eye-open); } -.app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link span { - color: var(--color-content-fg); -} @media (prefers-color-scheme: dark) { .app-body :is(.reply-indicator__content, .status__content) .status__content__spoiler-link:hover span { border-color: rgba(255, 255, 255, .3); } } + .app-body .icon-button.overlayed { - background-color: #ffffff; - color: #444b5d; - opacity: .6; - transition: opacity .3s; + background-color: rgba(0, 0, 0, .1); border-radius: 7px; } .app-body .icon-button.overlayed:hover { - background-color: #ffffff; - color: #444b5d; - opacity: 1; + background-color: rgba(0, 0, 0, .4); } .app-body .status__wrapper--filtered__button { color: var(--color-accent);