From d3db391cd6c3fbbe3c9c820beee5d597585c03bc Mon Sep 17 00:00:00 2001 From: nileane Date: Fri, 24 Nov 2023 16:04:00 +0000 Subject: [PATCH] Copy CSS files to installation folder --- .../tangerineui-cherry/tangerineui-cherry.scss | 18 +++++++++++++++++- .../tangerineui-purple/tangerineui-purple.scss | 18 +++++++++++++++++- .../styles/tangerineui/tangerineui.scss | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss index 42c6a39..970000c 100644 --- a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss +++ b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss @@ -448,6 +448,9 @@ body.app-body { background-image: var(--icon-star); margin: 0 4px -2px 0; } +.app-body .media-modal__overlay .icon-star { + background-image: var(--icon-star); +} /* Boost */ .app-body .icon-retweet { background-image: var(--icon-boost-accent); @@ -480,6 +483,9 @@ body.app-body { background-image: var(--icon-boost-accent); vertical-align: middle; } +.app-body .media-modal__overlay .icon-retweet { + background-image: var(--icon-boost); +} /* Reply */ .app-body .icon-reply, .app-body .icon-reply-all { @@ -488,6 +494,9 @@ body.app-body { .app-body .detailed-status__action-bar :is(.icon-reply, .icon-reply-all) { background-image: var(--icon-reply-accent); } +.app-body .media-modal__overlay :is(.icon-reply, .icon-reply-all) { + background-image: var(--icon-reply); +} /* Ellipsis */ .app-body :is(.icon-ellipsis-h, .icon-ellipsis-v) { background-image: var(--icon-ellipsis-accent); @@ -2618,7 +2627,10 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu } .app-body .navigation-panel:has(> *:nth-child(5):last-child) - :is(.column-link, .navigation-panel__legal) { + :is(.column-link, .navigation-panel__legal), + .app-body + .navigation-panel:has(> *:nth-child(7):last-child):has(.getting-started__trends) + :is(.column-link, .navigation-panel__legal) { flex: calc(100vw / 3); } .app-body @@ -2626,6 +2638,10 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu :is(.column-link, .navigation-panel__legal) { flex: 25vw; } + .app-body + .navigation-panel:has(> *:nth-child(7):last-child):has(.getting-started__trends)::after { + display: none; + } .app-body .column-link--transparent:is(.active, .active:hover, :active) { margin: 6px 0 8px; padding: 4px 0 3px; diff --git a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss index 0d857bd..f9ce454 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss @@ -448,6 +448,9 @@ body.app-body { background-image: var(--icon-star); margin: 0 4px -2px 0; } +.app-body .media-modal__overlay .icon-star { + background-image: var(--icon-star); +} /* Boost */ .app-body .icon-retweet { background-image: var(--icon-boost-accent); @@ -480,6 +483,9 @@ body.app-body { background-image: var(--icon-boost-accent); vertical-align: middle; } +.app-body .media-modal__overlay .icon-retweet { + background-image: var(--icon-boost); +} /* Reply */ .app-body .icon-reply, .app-body .icon-reply-all { @@ -488,6 +494,9 @@ body.app-body { .app-body .detailed-status__action-bar :is(.icon-reply, .icon-reply-all) { background-image: var(--icon-reply-accent); } +.app-body .media-modal__overlay :is(.icon-reply, .icon-reply-all) { + background-image: var(--icon-reply); +} /* Ellipsis */ .app-body :is(.icon-ellipsis-h, .icon-ellipsis-v) { background-image: var(--icon-ellipsis-accent); @@ -2618,7 +2627,10 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu } .app-body .navigation-panel:has(> *:nth-child(5):last-child) - :is(.column-link, .navigation-panel__legal) { + :is(.column-link, .navigation-panel__legal), + .app-body + .navigation-panel:has(> *:nth-child(7):last-child):has(.getting-started__trends) + :is(.column-link, .navigation-panel__legal) { flex: calc(100vw / 3); } .app-body @@ -2626,6 +2638,10 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu :is(.column-link, .navigation-panel__legal) { flex: 25vw; } + .app-body + .navigation-panel:has(> *:nth-child(7):last-child):has(.getting-started__trends)::after { + display: none; + } .app-body .column-link--transparent:is(.active, .active:hover, :active) { margin: 6px 0 8px; padding: 4px 0 3px; diff --git a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss index c3b91c5..53d8d0d 100644 --- a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss +++ b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss @@ -448,6 +448,9 @@ body.app-body { background-image: var(--icon-star); margin: 0 4px -2px 0; } +.app-body .media-modal__overlay .icon-star { + background-image: var(--icon-star); +} /* Boost */ .app-body .icon-retweet { background-image: var(--icon-boost-accent); @@ -480,6 +483,9 @@ body.app-body { background-image: var(--icon-boost-accent); vertical-align: middle; } +.app-body .media-modal__overlay .icon-retweet { + background-image: var(--icon-boost); +} /* Reply */ .app-body .icon-reply, .app-body .icon-reply-all { @@ -488,6 +494,9 @@ body.app-body { .app-body .detailed-status__action-bar :is(.icon-reply, .icon-reply-all) { background-image: var(--icon-reply-accent); } +.app-body .media-modal__overlay :is(.icon-reply, .icon-reply-all) { + background-image: var(--icon-reply); +} /* Ellipsis */ .app-body :is(.icon-ellipsis-h, .icon-ellipsis-v) { background-image: var(--icon-ellipsis-accent); @@ -2618,7 +2627,10 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu } .app-body .navigation-panel:has(> *:nth-child(5):last-child) - :is(.column-link, .navigation-panel__legal) { + :is(.column-link, .navigation-panel__legal), + .app-body + .navigation-panel:has(> *:nth-child(7):last-child):has(.getting-started__trends) + :is(.column-link, .navigation-panel__legal) { flex: calc(100vw / 3); } .app-body @@ -2626,6 +2638,10 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu :is(.column-link, .navigation-panel__legal) { flex: 25vw; } + .app-body + .navigation-panel:has(> *:nth-child(7):last-child):has(.getting-started__trends)::after { + display: none; + } .app-body .column-link--transparent:is(.active, .active:hover, :active) { margin: 6px 0 8px; padding: 4px 0 3px;