From 14d63ef3e5e814ed8f880545a6997c5002fe3f01 Mon Sep 17 00:00:00 2001 From: nileane Date: Mon, 26 Aug 2024 14:44:53 +0000 Subject: [PATCH] Copy CSS files to installation folder --- .../tangerineui-cherry.scss | 25 +++++++++++++------ .../tangerineui-lagoon.scss | 25 +++++++++++++------ .../tangerineui-purple.scss | 25 +++++++++++++------ .../styles/tangerineui/tangerineui.scss | 25 +++++++++++++------ 4 files changed, 68 insertions(+), 32 deletions(-) diff --git a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss index 909b928..20b8b98 100644 --- a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss +++ b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss @@ -3518,16 +3518,17 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu transform: scale(.9); } -.app-body .load-gap, -.app-body .load-more { - background-color: var(--color-accent-bg); +.app-body :is(.load-gap, .load-more) { + background-color: var(--color-content-secondary-bg); color: var(--color-accent); border-bottom: 0; } -.app-body .load-gap:hover, -.app-body .load-more:hover { +.app-body :is(.load-gap, .load-more):is(:active, :hover) { background-color: var(--color-accent-lines); } +.app-body :is(.load-gap, .load-more) .icon-ellipsis-h { + background-image: var(--icon-ellipsis-column-link-active-accent); +} .app-body .column-header__collapsible { background-color: color-mix(in srgb, var(--color-content-secondary-bg), transparent 15%); @@ -6821,6 +6822,7 @@ a:is(.active, box-shadow: 0 -20px var(--color-bg); border-left: 1px solid var(--color-lines); border-right: 1px solid var(--color-lines); + border-bottom: 1px solid var(--color-lines); } .app-body .announcements__item strong { font-weight: 800; @@ -6842,10 +6844,14 @@ a:is(.active, border-radius: 8px; padding: 2px 8px; } +.app-body .reactions-bar .emoji-picker-dropdown .icon-button { + padding: 3px; +} .app-body .reactions-bar__item:is(:active, :hover, :focus) { background-color: var(--color-content-bg); } -.app-body .reactions-bar__item.active { +.app-body .reactions-bar__item.active, +.app-body .reactions-bar .emoji-picker-dropdown .icon-button.active.inverted { background-color: var(--color-accent); } .app-body .reactions-bar__item__count, @@ -6869,8 +6875,11 @@ a:is(.active, @media screen and (max-width:1174px) { .app-body .announcements { box-shadow: none; - margin-top: -4px; - border-radius: 0; + margin-top: 1px; + border-left: 0; + border-right: 0; + margin-inline-start: -45px; + margin-inline-end: -55px; } .app-body .announcements__mastodon { border-radius: 0; diff --git a/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss b/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss index 5bf9c83..757e8ad 100644 --- a/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss +++ b/mastodon/app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss @@ -3518,16 +3518,17 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu transform: scale(.9); } -.app-body .load-gap, -.app-body .load-more { - background-color: var(--color-accent-bg); +.app-body :is(.load-gap, .load-more) { + background-color: var(--color-content-secondary-bg); color: var(--color-accent); border-bottom: 0; } -.app-body .load-gap:hover, -.app-body .load-more:hover { +.app-body :is(.load-gap, .load-more):is(:active, :hover) { background-color: var(--color-accent-lines); } +.app-body :is(.load-gap, .load-more) .icon-ellipsis-h { + background-image: var(--icon-ellipsis-column-link-active-accent); +} .app-body .column-header__collapsible { background-color: color-mix(in srgb, var(--color-content-secondary-bg), transparent 15%); @@ -6821,6 +6822,7 @@ a:is(.active, box-shadow: 0 -20px var(--color-bg); border-left: 1px solid var(--color-lines); border-right: 1px solid var(--color-lines); + border-bottom: 1px solid var(--color-lines); } .app-body .announcements__item strong { font-weight: 800; @@ -6842,10 +6844,14 @@ a:is(.active, border-radius: 8px; padding: 2px 8px; } +.app-body .reactions-bar .emoji-picker-dropdown .icon-button { + padding: 3px; +} .app-body .reactions-bar__item:is(:active, :hover, :focus) { background-color: var(--color-content-bg); } -.app-body .reactions-bar__item.active { +.app-body .reactions-bar__item.active, +.app-body .reactions-bar .emoji-picker-dropdown .icon-button.active.inverted { background-color: var(--color-accent); } .app-body .reactions-bar__item__count, @@ -6869,8 +6875,11 @@ a:is(.active, @media screen and (max-width:1174px) { .app-body .announcements { box-shadow: none; - margin-top: -4px; - border-radius: 0; + margin-top: 1px; + border-left: 0; + border-right: 0; + margin-inline-start: -45px; + margin-inline-end: -55px; } .app-body .announcements__mastodon { border-radius: 0; diff --git a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss index ec18989..eb239f9 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss @@ -3518,16 +3518,17 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu transform: scale(.9); } -.app-body .load-gap, -.app-body .load-more { - background-color: var(--color-accent-bg); +.app-body :is(.load-gap, .load-more) { + background-color: var(--color-content-secondary-bg); color: var(--color-accent); border-bottom: 0; } -.app-body .load-gap:hover, -.app-body .load-more:hover { +.app-body :is(.load-gap, .load-more):is(:active, :hover) { background-color: var(--color-accent-lines); } +.app-body :is(.load-gap, .load-more) .icon-ellipsis-h { + background-image: var(--icon-ellipsis-column-link-active-accent); +} .app-body .column-header__collapsible { background-color: color-mix(in srgb, var(--color-content-secondary-bg), transparent 15%); @@ -6821,6 +6822,7 @@ a:is(.active, box-shadow: 0 -20px var(--color-bg); border-left: 1px solid var(--color-lines); border-right: 1px solid var(--color-lines); + border-bottom: 1px solid var(--color-lines); } .app-body .announcements__item strong { font-weight: 800; @@ -6842,10 +6844,14 @@ a:is(.active, border-radius: 8px; padding: 2px 8px; } +.app-body .reactions-bar .emoji-picker-dropdown .icon-button { + padding: 3px; +} .app-body .reactions-bar__item:is(:active, :hover, :focus) { background-color: var(--color-content-bg); } -.app-body .reactions-bar__item.active { +.app-body .reactions-bar__item.active, +.app-body .reactions-bar .emoji-picker-dropdown .icon-button.active.inverted { background-color: var(--color-accent); } .app-body .reactions-bar__item__count, @@ -6869,8 +6875,11 @@ a:is(.active, @media screen and (max-width:1174px) { .app-body .announcements { box-shadow: none; - margin-top: -4px; - border-radius: 0; + margin-top: 1px; + border-left: 0; + border-right: 0; + margin-inline-start: -45px; + margin-inline-end: -55px; } .app-body .announcements__mastodon { border-radius: 0; diff --git a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss index 756d95b..51c02b0 100644 --- a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss +++ b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss @@ -3518,16 +3518,17 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu transform: scale(.9); } -.app-body .load-gap, -.app-body .load-more { - background-color: var(--color-accent-bg); +.app-body :is(.load-gap, .load-more) { + background-color: var(--color-content-secondary-bg); color: var(--color-accent); border-bottom: 0; } -.app-body .load-gap:hover, -.app-body .load-more:hover { +.app-body :is(.load-gap, .load-more):is(:active, :hover) { background-color: var(--color-accent-lines); } +.app-body :is(.load-gap, .load-more) .icon-ellipsis-h { + background-image: var(--icon-ellipsis-column-link-active-accent); +} .app-body .column-header__collapsible { background-color: color-mix(in srgb, var(--color-content-secondary-bg), transparent 15%); @@ -6821,6 +6822,7 @@ a:is(.active, box-shadow: 0 -20px var(--color-bg); border-left: 1px solid var(--color-lines); border-right: 1px solid var(--color-lines); + border-bottom: 1px solid var(--color-lines); } .app-body .announcements__item strong { font-weight: 800; @@ -6842,10 +6844,14 @@ a:is(.active, border-radius: 8px; padding: 2px 8px; } +.app-body .reactions-bar .emoji-picker-dropdown .icon-button { + padding: 3px; +} .app-body .reactions-bar__item:is(:active, :hover, :focus) { background-color: var(--color-content-bg); } -.app-body .reactions-bar__item.active { +.app-body .reactions-bar__item.active, +.app-body .reactions-bar .emoji-picker-dropdown .icon-button.active.inverted { background-color: var(--color-accent); } .app-body .reactions-bar__item__count, @@ -6869,8 +6875,11 @@ a:is(.active, @media screen and (max-width:1174px) { .app-body .announcements { box-shadow: none; - margin-top: -4px; - border-radius: 0; + margin-top: 1px; + border-left: 0; + border-right: 0; + margin-inline-start: -45px; + margin-inline-end: -55px; } .app-body .announcements__mastodon { border-radius: 0;