From 84088f0d1b4665f2e4ef44659ad15fca117c2535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nil=C3=A9ane?= Date: Tue, 8 Aug 2023 20:59:24 +0200 Subject: [PATCH] Tweaks to hashtag headers --- TangerineUI-purple.css | 57 ++++++++++--------- TangerineUI.css | 57 ++++++++++--------- .../layout-single-column.scss | 57 ++++++++++--------- .../tangerineui/layout-single-column.scss | 57 ++++++++++--------- 4 files changed, 120 insertions(+), 108 deletions(-) diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css index 4cd08ff..c6336cc 100644 --- a/TangerineUI-purple.css +++ b/TangerineUI-purple.css @@ -2265,6 +2265,36 @@ body.layout-single-column { color: var(--color-fg); } + +/* Hashtag header */ +.layout-single-column .hashtag-header { + font-size: 15px; + color: var(--color-accent); + background-color: var(--color-accent-bg); + border-top: 1px solid var(--color-accent-lines); + border-bottom: 1px solid var(--color-lines); +} +.layout-single-column .hashtag-header__header { + margin-bottom: 0; +} +.layout-single-column .hashtag-header__header h1 { + color: var(--color-content-fg); +} +@media screen and (min-width:890px) and (max-width:1174px) { + .layout-single-column .hashtag-header { + margin-top: 15px; + } +} +@media screen and (min-width:890px) { + .layout-single-column .hashtag-header { + border-top-left-radius: 8px; + border-top-right-radius: 8px; + border-left: 1px solid var(--color-accent-lines); + border-right: 1px solid var(--color-accent-lines); + } +} + + /* Account recommendations (For You Tab + User directory */ .layout-single-column .scrollable .account-card { margin: 0 0 10px; @@ -2528,33 +2558,6 @@ body.layout-single-column { padding: 6px 17px; } -/* Hashtag header */ -.layout-single-column .hashtag-header { - color: var(--color-fg-muted); - background-color: var(--color-accent-bg); - border-top: 1px solid var(--color-accent-lines); - border-bottom: 1px solid var(--color-lines); -} -.layout-single-column .hashtag-header__header { - margin-bottom: 0; -} -.layout-single-column .hashtag-header__header h1 { - color: var(--color-content-fg); -} -@media screen and (min-width:890px) and (max-width:1174px) { - .layout-single-column .hashtag-header { - margin-top: 15px; - } -} -@media screen and (min-width:890px) { - .layout-single-column .hashtag-header { - border-top-left-radius: 8px; - border-top-right-radius: 8px; - border-left: 1px solid var(--color-accent-lines); - border-right: 1px solid var(--color-accent-lines); - } -} - /* 🔔 Notifications diff --git a/TangerineUI.css b/TangerineUI.css index f30c3cc..cff2e7d 100644 --- a/TangerineUI.css +++ b/TangerineUI.css @@ -2265,6 +2265,36 @@ body.layout-single-column { color: var(--color-fg); } + +/* Hashtag header */ +.layout-single-column .hashtag-header { + font-size: 15px; + color: var(--color-accent); + background-color: var(--color-accent-bg); + border-top: 1px solid var(--color-accent-lines); + border-bottom: 1px solid var(--color-lines); +} +.layout-single-column .hashtag-header__header { + margin-bottom: 0; +} +.layout-single-column .hashtag-header__header h1 { + color: var(--color-content-fg); +} +@media screen and (min-width:890px) and (max-width:1174px) { + .layout-single-column .hashtag-header { + margin-top: 15px; + } +} +@media screen and (min-width:890px) { + .layout-single-column .hashtag-header { + border-top-left-radius: 8px; + border-top-right-radius: 8px; + border-left: 1px solid var(--color-accent-lines); + border-right: 1px solid var(--color-accent-lines); + } +} + + /* Account recommendations (For You Tab + User directory */ .layout-single-column .scrollable .account-card { margin: 0 0 10px; @@ -2528,33 +2558,6 @@ body.layout-single-column { padding: 6px 17px; } -/* Hashtag header */ -.layout-single-column .hashtag-header { - color: var(--color-fg-muted); - background-color: var(--color-accent-bg); - border-top: 1px solid var(--color-accent-lines); - border-bottom: 1px solid var(--color-lines); -} -.layout-single-column .hashtag-header__header { - margin-bottom: 0; -} -.layout-single-column .hashtag-header__header h1 { - color: var(--color-content-fg); -} -@media screen and (min-width:890px) and (max-width:1174px) { - .layout-single-column .hashtag-header { - margin-top: 15px; - } -} -@media screen and (min-width:890px) { - .layout-single-column .hashtag-header { - border-top-left-radius: 8px; - border-top-right-radius: 8px; - border-left: 1px solid var(--color-accent-lines); - border-right: 1px solid var(--color-accent-lines); - } -} - /* 🔔 Notifications diff --git a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss index 4cd08ff..c6336cc 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss @@ -2265,6 +2265,36 @@ body.layout-single-column { color: var(--color-fg); } + +/* Hashtag header */ +.layout-single-column .hashtag-header { + font-size: 15px; + color: var(--color-accent); + background-color: var(--color-accent-bg); + border-top: 1px solid var(--color-accent-lines); + border-bottom: 1px solid var(--color-lines); +} +.layout-single-column .hashtag-header__header { + margin-bottom: 0; +} +.layout-single-column .hashtag-header__header h1 { + color: var(--color-content-fg); +} +@media screen and (min-width:890px) and (max-width:1174px) { + .layout-single-column .hashtag-header { + margin-top: 15px; + } +} +@media screen and (min-width:890px) { + .layout-single-column .hashtag-header { + border-top-left-radius: 8px; + border-top-right-radius: 8px; + border-left: 1px solid var(--color-accent-lines); + border-right: 1px solid var(--color-accent-lines); + } +} + + /* Account recommendations (For You Tab + User directory */ .layout-single-column .scrollable .account-card { margin: 0 0 10px; @@ -2528,33 +2558,6 @@ body.layout-single-column { padding: 6px 17px; } -/* Hashtag header */ -.layout-single-column .hashtag-header { - color: var(--color-fg-muted); - background-color: var(--color-accent-bg); - border-top: 1px solid var(--color-accent-lines); - border-bottom: 1px solid var(--color-lines); -} -.layout-single-column .hashtag-header__header { - margin-bottom: 0; -} -.layout-single-column .hashtag-header__header h1 { - color: var(--color-content-fg); -} -@media screen and (min-width:890px) and (max-width:1174px) { - .layout-single-column .hashtag-header { - margin-top: 15px; - } -} -@media screen and (min-width:890px) { - .layout-single-column .hashtag-header { - border-top-left-radius: 8px; - border-top-right-radius: 8px; - border-left: 1px solid var(--color-accent-lines); - border-right: 1px solid var(--color-accent-lines); - } -} - /* 🔔 Notifications diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss index f30c3cc..cff2e7d 100644 --- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss @@ -2265,6 +2265,36 @@ body.layout-single-column { color: var(--color-fg); } + +/* Hashtag header */ +.layout-single-column .hashtag-header { + font-size: 15px; + color: var(--color-accent); + background-color: var(--color-accent-bg); + border-top: 1px solid var(--color-accent-lines); + border-bottom: 1px solid var(--color-lines); +} +.layout-single-column .hashtag-header__header { + margin-bottom: 0; +} +.layout-single-column .hashtag-header__header h1 { + color: var(--color-content-fg); +} +@media screen and (min-width:890px) and (max-width:1174px) { + .layout-single-column .hashtag-header { + margin-top: 15px; + } +} +@media screen and (min-width:890px) { + .layout-single-column .hashtag-header { + border-top-left-radius: 8px; + border-top-right-radius: 8px; + border-left: 1px solid var(--color-accent-lines); + border-right: 1px solid var(--color-accent-lines); + } +} + + /* Account recommendations (For You Tab + User directory */ .layout-single-column .scrollable .account-card { margin: 0 0 10px; @@ -2528,33 +2558,6 @@ body.layout-single-column { padding: 6px 17px; } -/* Hashtag header */ -.layout-single-column .hashtag-header { - color: var(--color-fg-muted); - background-color: var(--color-accent-bg); - border-top: 1px solid var(--color-accent-lines); - border-bottom: 1px solid var(--color-lines); -} -.layout-single-column .hashtag-header__header { - margin-bottom: 0; -} -.layout-single-column .hashtag-header__header h1 { - color: var(--color-content-fg); -} -@media screen and (min-width:890px) and (max-width:1174px) { - .layout-single-column .hashtag-header { - margin-top: 15px; - } -} -@media screen and (min-width:890px) { - .layout-single-column .hashtag-header { - border-top-left-radius: 8px; - border-top-right-radius: 8px; - border-left: 1px solid var(--color-accent-lines); - border-right: 1px solid var(--color-accent-lines); - } -} - /* 🔔 Notifications