From 44323d9d6b68c42ddcd6b4845132918996874ad4 Mon Sep 17 00:00:00 2001 From: nileane Date: Fri, 1 Dec 2023 15:34:54 +0000 Subject: [PATCH] Copy CSS files to installation folder --- .../tangerineui-cherry.scss | 88 +++++++++++++++++-- .../tangerineui-purple.scss | 88 +++++++++++++++++-- .../styles/tangerineui/tangerineui.scss | 88 +++++++++++++++++-- 3 files changed, 237 insertions(+), 27 deletions(-) diff --git a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss index 5443b59..b6e83a1 100644 --- a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss +++ b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss @@ -84,6 +84,7 @@ --icon-ellipsis-active: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2QzNDg3ZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0xNTYsMTI4YTI4LDI4LDAsMSwxLTI4LTI4QTI4LDI4LDAsMCwxLDE1NiwxMjhaTTQ4LDEwMGEyOCwyOCwwLDEsMCwyOCwyOEEyOCwyOCwwLDAsMCw0OCwxMDBabTE2MCwwYTI4LDI4LDAsMSwwLDI4LDI4QTI4LDI4LDAsMCwwLDIwOCwxMDBaIj48L3BhdGg+PC9zdmc+"); --icon-poll: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsOTJIMTgwVjU2YTEyLDEyLDAsMCwwLTEyLTEySDUyVjQwYTEyLDEyLDAsMCwwLTI0LDBWMjE2YTEyLDEyLDAsMCwwLDI0LDB2LTRoODRhMTIsMTIsMCwwLDAsMTItMTJWMTY0aDY4YTEyLDEyLDAsMCwwLDEyLTEyVjEwNEExMiwxMiwwLDAsMCwyMTYsOTJaTTE1Niw2OFY5Mkg1MlY2OFpNMTI0LDE4OEg1MlYxNjRoNzJabTgwLTQ4SDUyVjExNkgyMDRaIj48L3BhdGg+PC9zdmc+"); --icon-poll-accent: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2QzNDg3ZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsMTA0djQ4SDQwVjEwNFoiIG9wYWNpdHk9IjAuMiI+PC9wYXRoPjxwYXRoIGQ9Ik0yMTYsOTZIMTc2VjU2YTgsOCwwLDAsMC04LThINDhWNDBhOCw4LDAsMCwwLTE2LDBWMjE2YTgsOCwwLDAsMCwxNiwwdi04aDg4YTgsOCwwLDAsMCw4LThWMTYwaDcyYTgsOCwwLDAsMCw4LThWMTA0QTgsOCwwLDAsMCwyMTYsOTZaTTE2MCw2NFY5Nkg0OFY2NFpNMTI4LDE5Mkg0OFYxNjBoODBabTgwLTQ4SDQ4VjExMkgyMDhaIj48L3BhdGg+PC9zdmc+"); + --icon-poll-active: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2ZmZmZmZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTEydjMyYTgsOCwwLDAsMS04LDhINDh2MTZoODhhOCw4LDAsMCwxLDgsOHYyNGE4LDgsMCwwLDEtOCw4SDQ4djhhOCw4LDAsMCwxLTE2LDBWNDBhOCw4LDAsMCwxLDE2LDB2OEgxNjhhOCw4LDAsMCwxLDgsOFY4MGE4LDgsMCwwLDEtOCw4SDQ4djE2SDIxNkE4LDgsMCwwLDEsMjI0LDExMloiPjwvcGF0aD48L3N2Zz4="); --icon-post: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiIHN0eWxlPSItLW5vaXItaW5saW5lLWZpbGw6ICNjOWM1YmU7IiBkYXRhLW5vaXItaW5saW5lLWZpbGw9IiI+PHBhdGggZD0iTTIyNCwxMjhBOTYsOTYsMCwwLDEsNzkuOTMsMjExLjExaDBMNDIuNTQsMjIzLjU4YTgsOCwwLDAsMS0xMC4xMi0xMC4xMmwxMi40Ny0zNy4zOWgwQTk2LDk2LDAsMSwxLDIyNCwxMjhaIiBvcGFjaXR5PSIwLjIiPjwvcGF0aD48cGF0aCBkPSJNMTI4LDI0QTEwNCwxMDQsMCwwLDAsMzYuMTgsMTc2Ljg4TDI0LjgzLDIxMC45M2ExNiwxNiwwLDAsMCwyMC4yNCwyMC4yNGwzNC4wNS0xMS4zNUExMDQsMTA0LDAsMSwwLDEyOCwyNFptMCwxOTJhODcuODcsODcuODcsMCwwLDEtNDQuMDYtMTEuODEsOCw4LDAsMCwwLTQtMS4wOCw3Ljg1LDcuODUsMCwwLDAtMi41My40Mkw0MCwyMTYsNTIuNDcsMTc4LjZhOCw4LDAsMCwwLS42Ni02LjU0QTg4LDg4LDAsMSwxLDEyOCwyMTZabTEyLTg4YTEyLDEyLDAsMSwxLTEyLTEyQTEyLDEyLDAsMCwxLDE0MCwxMjhabS00NCwwYTEyLDEyLDAsMSwxLTEyLTEyQTEyLDEyLDAsMCwxLDk2LDEyOFptODgsMGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSwxODQsMTI4WiI+PC9wYXRoPjwvc3ZnPg=="); --icon-post-notification: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0xMjAsMTI4YTE2LDE2LDAsMSwxLTE2LTE2QTE2LDE2LDAsMCwxLDEyMCwxMjhabTMyLTE2YTE2LDE2LDAsMSwwLDE2LDE2QTE2LDE2LDAsMCwwLDE1MiwxMTJabTg0LDE2QTEwOCwxMDgsMCwwLDEsNzguNzcsMjI0LjE1TDQ2LjM0LDIzNUEyMCwyMCwwLDAsMSwyMSwyMDkuNjZsMTAuODEtMzIuNDNBMTA4LDEwOCwwLDEsMSwyMzYsMTI4Wm0tMjQsMEE4NCw4NCwwLDEsMCw1NS4yNywxNzAuMDZhMTIsMTIsMCwwLDEsMSw5LjgxbC05LjkzLDI5Ljc5LDI5Ljc5LTkuOTNhMTIuMSwxMi4xLDAsMCwxLDMuOC0uNjIsMTIsMTIsMCwwLDEsNiwxLjYyQTg0LDg0LDAsMCwwLDIxMiwxMjhaIj48L3BhdGg+PC9zdmc+"); --icon-post-notification-accent: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2QzNDg3ZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTI4QTk2LDk2LDAsMCwxLDc5LjkzLDIxMS4xMWgwTDQyLjU0LDIyMy41OGE4LDgsMCwwLDEtMTAuMTItMTAuMTJsMTIuNDctMzcuMzloMEE5Niw5NiwwLDEsMSwyMjQsMTI4WiIgb3BhY2l0eT0iMC4yIj48L3BhdGg+PHBhdGggZD0iTTEyOCwyNEExMDQsMTA0LDAsMCwwLDM2LjE4LDE3Ni44OEwyNC44MywyMTAuOTNhMTYsMTYsMCwwLDAsMjAuMjQsMjAuMjRsMzQuMDUtMTEuMzVBMTA0LDEwNCwwLDEsMCwxMjgsMjRabTAsMTkyYTg3Ljg3LDg3Ljg3LDAsMCwxLTQ0LjA2LTExLjgxLDgsOCwwLDAsMC00LTEuMDgsNy44NSw3Ljg1LDAsMCwwLTIuNTMuNDJMNDAsMjE2LDUyLjQ3LDE3OC42YTgsOCwwLDAsMC0uNjYtNi41NEE4OCw4OCwwLDEsMSwxMjgsMjE2Wm0xMi04OGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSwxNDAsMTI4Wm0tNDQsMGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSw5NiwxMjhabTg4LDBhMTIsMTIsMCwxLDEtMTItMTJBMTIsMTIsMCwwLDEsMTg0LDEyOFoiPjwvcGF0aD48L3N2Zz4="); @@ -802,6 +803,41 @@ body.app-body { } + +/* Links */ +.app-body a:is(.status-link, .mention, .navigation-bar__profile-edit) span, +.app-body :is(.account__header__fields, .account__header__content) a span { + text-decoration-line: underline; + text-decoration-color: var(--color-accent-bg); + text-decoration-thickness: 2px; + text-underline-offset: 2px; +} +.app-body a:is(.status-link, .mention, .navigation-bar__profile-edit):is(:active, :focus, :hover) span, +.app-body :is(.account__header__fields, .account__header__content, .trends__item__name) a:is(:active, :focus, :hover) span, +.app-body + :is( + .detailed-status__display-name, + .reply-indicator__display-name, + .status__display-name, + a.account__display-name + ):is(:active, :focus, :hover) + .display-name strong, +.app-body :is(.detailed-status__datetime, .status__relative-time):is(:active, :focus, :hover) { + text-decoration-line: underline; + text-decoration-color: currentColor; + text-decoration-thickness: 2px; + text-underline-offset: 2px; +} +.app-body a:is(.status-link, .mention):is(:active, :focus, :hover), +.app-body :is(.account__header__fields, .account__header__content) a:is(:active, :focus, :hover) { + text-decoration: none !important; +} +.app-body .account__header__fields .verified a span { + display: inline; +} + + + /* 📝 Compose panel ---------------- */ .app-body .compose-form { @@ -1241,7 +1277,8 @@ body.app-body { .app-body .status__content__text blockquote { color: var(--color-content-fg); border-color: var(--color-lines); -} +} + /* 📏 Post dividers */ /* Use ::before to set a non-full-width divider between posts and notifications. The divider sits above the post. */ @@ -1891,8 +1928,16 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .app-body .compose-form__poll-wrapper ul { background-color: var(--color-accent-bg); } -.app-body .compose-form__poll-wrapper .autosuggest-input input:focus { - box-shadow: 0 0 0 2px var(--color-accent); +.app-body .compose-form__poll-wrapper .autosuggest-input input, +.app-body .compose-form__poll-wrapper select { + background-color: var(--color-content-bg); + border: 1px solid var(--color-lines); + border-radius: 8px; + color: var(--color-content-fg); +} +.app-body .compose-form__poll-wrapper .autosuggest-input input:focus, +.app-body .compose-form__poll-wrapper select:focus { + border-color: var(--color-accent); } .app-body .compose-form__poll-wrapper .poll__footer .button.button-secondary { padding: 6px 16px; @@ -1901,6 +1946,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu color: transparent; pointer-events: none; } +.app-body .compose-form__poll-button .icon-button.active { + background-color: var(--color-accent); +} +.app-body .compose-form__poll-button .icon-button.active .icon-tasks { + background-image: var(--icon-poll-active); +} /* Empty columns */ @@ -2944,7 +2995,11 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu border-bottom-right-radius: 8px !important; } } -.app-body .columns-area__panels__main .trends__item { +.layout-multiple-columns .explore__links.scrollable { + background-color: var(--color-content-bg); + overflow-y: auto; +} +.app-body .explore__links .trends__item { background-color: var(--color-content-bg); border-bottom: 2px solid var(--color-content-secondary-bg); } @@ -2963,7 +3018,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu /* Hashtag header */ .app-body .hashtag-header { font-size: 15px; - padding: 22px 20px 24px; + padding: 24px 20px; color: var(--color-content-fg); background-color: var(--color-content-secondary-bg); border-top: 1px solid var(--color-lines); @@ -2982,12 +3037,27 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu margin-top: -5px; width: max-content; } - -@media screen and (min-width:890px) and (max-width:1174px) { - .app-body .hashtag-header { - margin-top: 15px; +@media screen and (max-width:460px) { + .app-body .hashtag-header .hashtag-header__header + div { + max-width: 55%; + line-height: 1.5; + margin-top: -2px; + } + .app-body .hashtag-header .hashtag-header__header + div > span { + display: inline-block; + margin-right: 5px; } } +.layout-multiple-columns .hashtag-header .hashtag-header__header + div { + max-width: 55%; + line-height: 1.5; + margin-top: -2px; +} +.layout-multiple-columns .hashtag-header .hashtag-header__header + div > span { + display: inline-block; + margin-right: 5px; +} + @media screen and (min-width:890px) { .app-body .hashtag-header { border-left: 1px solid var(--color-lines); diff --git a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss index d9cc1a4..c913e81 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss @@ -84,6 +84,7 @@ --icon-ellipsis-active: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzYzNjRmZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0xNTYsMTI4YTI4LDI4LDAsMSwxLTI4LTI4QTI4LDI4LDAsMCwxLDE1NiwxMjhaTTQ4LDEwMGEyOCwyOCwwLDEsMCwyOCwyOEEyOCwyOCwwLDAsMCw0OCwxMDBabTE2MCwwYTI4LDI4LDAsMSwwLDI4LDI4QTI4LDI4LDAsMCwwLDIwOCwxMDBaIj48L3BhdGg+PC9zdmc+"); --icon-poll: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsOTJIMTgwVjU2YTEyLDEyLDAsMCwwLTEyLTEySDUyVjQwYTEyLDEyLDAsMCwwLTI0LDBWMjE2YTEyLDEyLDAsMCwwLDI0LDB2LTRoODRhMTIsMTIsMCwwLDAsMTItMTJWMTY0aDY4YTEyLDEyLDAsMCwwLDEyLTEyVjEwNEExMiwxMiwwLDAsMCwyMTYsOTJaTTE1Niw2OFY5Mkg1MlY2OFpNMTI0LDE4OEg1MlYxNjRoNzJabTgwLTQ4SDUyVjExNkgyMDRaIj48L3BhdGg+PC9zdmc+"); --icon-poll-accent: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzYzNjRmZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsMTA0djQ4SDQwVjEwNFoiIG9wYWNpdHk9IjAuMiI+PC9wYXRoPjxwYXRoIGQ9Ik0yMTYsOTZIMTc2VjU2YTgsOCwwLDAsMC04LThINDhWNDBhOCw4LDAsMCwwLTE2LDBWMjE2YTgsOCwwLDAsMCwxNiwwdi04aDg4YTgsOCwwLDAsMCw4LThWMTYwaDcyYTgsOCwwLDAsMCw4LThWMTA0QTgsOCwwLDAsMCwyMTYsOTZaTTE2MCw2NFY5Nkg0OFY2NFpNMTI4LDE5Mkg0OFYxNjBoODBabTgwLTQ4SDQ4VjExMkgyMDhaIj48L3BhdGg+PC9zdmc+"); + --icon-poll-active: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2ZmZmZmZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTEydjMyYTgsOCwwLDAsMS04LDhINDh2MTZoODhhOCw4LDAsMCwxLDgsOHYyNGE4LDgsMCwwLDEtOCw4SDQ4djhhOCw4LDAsMCwxLTE2LDBWNDBhOCw4LDAsMCwxLDE2LDB2OEgxNjhhOCw4LDAsMCwxLDgsOFY4MGE4LDgsMCwwLDEtOCw4SDQ4djE2SDIxNkE4LDgsMCwwLDEsMjI0LDExMloiPjwvcGF0aD48L3N2Zz4="); --icon-post: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiIHN0eWxlPSItLW5vaXItaW5saW5lLWZpbGw6ICNjOWM1YmU7IiBkYXRhLW5vaXItaW5saW5lLWZpbGw9IiI+PHBhdGggZD0iTTIyNCwxMjhBOTYsOTYsMCwwLDEsNzkuOTMsMjExLjExaDBMNDIuNTQsMjIzLjU4YTgsOCwwLDAsMS0xMC4xMi0xMC4xMmwxMi40Ny0zNy4zOWgwQTk2LDk2LDAsMSwxLDIyNCwxMjhaIiBvcGFjaXR5PSIwLjIiPjwvcGF0aD48cGF0aCBkPSJNMTI4LDI0QTEwNCwxMDQsMCwwLDAsMzYuMTgsMTc2Ljg4TDI0LjgzLDIxMC45M2ExNiwxNiwwLDAsMCwyMC4yNCwyMC4yNGwzNC4wNS0xMS4zNUExMDQsMTA0LDAsMSwwLDEyOCwyNFptMCwxOTJhODcuODcsODcuODcsMCwwLDEtNDQuMDYtMTEuODEsOCw4LDAsMCwwLTQtMS4wOCw3Ljg1LDcuODUsMCwwLDAtMi41My40Mkw0MCwyMTYsNTIuNDcsMTc4LjZhOCw4LDAsMCwwLS42Ni02LjU0QTg4LDg4LDAsMSwxLDEyOCwyMTZabTEyLTg4YTEyLDEyLDAsMSwxLTEyLTEyQTEyLDEyLDAsMCwxLDE0MCwxMjhabS00NCwwYTEyLDEyLDAsMSwxLTEyLTEyQTEyLDEyLDAsMCwxLDk2LDEyOFptODgsMGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSwxODQsMTI4WiI+PC9wYXRoPjwvc3ZnPg=="); --icon-post-notification: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0xMjAsMTI4YTE2LDE2LDAsMSwxLTE2LTE2QTE2LDE2LDAsMCwxLDEyMCwxMjhabTMyLTE2YTE2LDE2LDAsMSwwLDE2LDE2QTE2LDE2LDAsMCwwLDE1MiwxMTJabTg0LDE2QTEwOCwxMDgsMCwwLDEsNzguNzcsMjI0LjE1TDQ2LjM0LDIzNUEyMCwyMCwwLDAsMSwyMSwyMDkuNjZsMTAuODEtMzIuNDNBMTA4LDEwOCwwLDEsMSwyMzYsMTI4Wm0tMjQsMEE4NCw4NCwwLDEsMCw1NS4yNywxNzAuMDZhMTIsMTIsMCwwLDEsMSw5LjgxbC05LjkzLDI5Ljc5LDI5Ljc5LTkuOTNhMTIuMSwxMi4xLDAsMCwxLDMuOC0uNjIsMTIsMTIsMCwwLDEsNiwxLjYyQTg0LDg0LDAsMCwwLDIxMiwxMjhaIj48L3BhdGg+PC9zdmc+"); --icon-post-notification-accent: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzYzNjRmZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTI4QTk2LDk2LDAsMCwxLDc5LjkzLDIxMS4xMWgwTDQyLjU0LDIyMy41OGE4LDgsMCwwLDEtMTAuMTItMTAuMTJsMTIuNDctMzcuMzloMEE5Niw5NiwwLDEsMSwyMjQsMTI4WiIgb3BhY2l0eT0iMC4yIj48L3BhdGg+PHBhdGggZD0iTTEyOCwyNEExMDQsMTA0LDAsMCwwLDM2LjE4LDE3Ni44OEwyNC44MywyMTAuOTNhMTYsMTYsMCwwLDAsMjAuMjQsMjAuMjRsMzQuMDUtMTEuMzVBMTA0LDEwNCwwLDEsMCwxMjgsMjRabTAsMTkyYTg3Ljg3LDg3Ljg3LDAsMCwxLTQ0LjA2LTExLjgxLDgsOCwwLDAsMC00LTEuMDgsNy44NSw3Ljg1LDAsMCwwLTIuNTMuNDJMNDAsMjE2LDUyLjQ3LDE3OC42YTgsOCwwLDAsMC0uNjYtNi41NEE4OCw4OCwwLDEsMSwxMjgsMjE2Wm0xMi04OGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSwxNDAsMTI4Wm0tNDQsMGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSw5NiwxMjhabTg4LDBhMTIsMTIsMCwxLDEtMTItMTJBMTIsMTIsMCwwLDEsMTg0LDEyOFoiPjwvcGF0aD48L3N2Zz4="); @@ -801,6 +802,41 @@ body.app-body { } + +/* Links */ +.app-body a:is(.status-link, .mention, .navigation-bar__profile-edit) span, +.app-body :is(.account__header__fields, .account__header__content) a span { + text-decoration-line: underline; + text-decoration-color: var(--color-accent-bg); + text-decoration-thickness: 2px; + text-underline-offset: 2px; +} +.app-body a:is(.status-link, .mention, .navigation-bar__profile-edit):is(:active, :focus, :hover) span, +.app-body :is(.account__header__fields, .account__header__content, .trends__item__name) a:is(:active, :focus, :hover) span, +.app-body + :is( + .detailed-status__display-name, + .reply-indicator__display-name, + .status__display-name, + a.account__display-name + ):is(:active, :focus, :hover) + .display-name strong, +.app-body :is(.detailed-status__datetime, .status__relative-time):is(:active, :focus, :hover) { + text-decoration-line: underline; + text-decoration-color: currentColor; + text-decoration-thickness: 2px; + text-underline-offset: 2px; +} +.app-body a:is(.status-link, .mention):is(:active, :focus, :hover), +.app-body :is(.account__header__fields, .account__header__content) a:is(:active, :focus, :hover) { + text-decoration: none !important; +} +.app-body .account__header__fields .verified a span { + display: inline; +} + + + /* 📝 Compose panel ---------------- */ .app-body .compose-form { @@ -1240,7 +1276,8 @@ body.app-body { .app-body .status__content__text blockquote { color: var(--color-content-fg); border-color: var(--color-lines); -} +} + /* 📏 Post dividers */ /* Use ::before to set a non-full-width divider between posts and notifications. The divider sits above the post. */ @@ -1890,8 +1927,16 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .app-body .compose-form__poll-wrapper ul { background-color: var(--color-accent-bg); } -.app-body .compose-form__poll-wrapper .autosuggest-input input:focus { - box-shadow: 0 0 0 2px var(--color-accent); +.app-body .compose-form__poll-wrapper .autosuggest-input input, +.app-body .compose-form__poll-wrapper select { + background-color: var(--color-content-bg); + border: 1px solid var(--color-lines); + border-radius: 8px; + color: var(--color-content-fg); +} +.app-body .compose-form__poll-wrapper .autosuggest-input input:focus, +.app-body .compose-form__poll-wrapper select:focus { + border-color: var(--color-accent); } .app-body .compose-form__poll-wrapper .poll__footer .button.button-secondary { padding: 6px 16px; @@ -1900,6 +1945,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu color: transparent; pointer-events: none; } +.app-body .compose-form__poll-button .icon-button.active { + background-color: var(--color-accent); +} +.app-body .compose-form__poll-button .icon-button.active .icon-tasks { + background-image: var(--icon-poll-active); +} /* Empty columns */ @@ -2943,7 +2994,11 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu border-bottom-right-radius: 8px !important; } } -.app-body .columns-area__panels__main .trends__item { +.layout-multiple-columns .explore__links.scrollable { + background-color: var(--color-content-bg); + overflow-y: auto; +} +.app-body .explore__links .trends__item { background-color: var(--color-content-bg); border-bottom: 2px solid var(--color-content-secondary-bg); } @@ -2962,7 +3017,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu /* Hashtag header */ .app-body .hashtag-header { font-size: 15px; - padding: 22px 20px 24px; + padding: 24px 20px; color: var(--color-content-fg); background-color: var(--color-content-secondary-bg); border-top: 1px solid var(--color-lines); @@ -2981,12 +3036,27 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu margin-top: -5px; width: max-content; } - -@media screen and (min-width:890px) and (max-width:1174px) { - .app-body .hashtag-header { - margin-top: 15px; +@media screen and (max-width:460px) { + .app-body .hashtag-header .hashtag-header__header + div { + max-width: 55%; + line-height: 1.5; + margin-top: -2px; + } + .app-body .hashtag-header .hashtag-header__header + div > span { + display: inline-block; + margin-right: 5px; } } +.layout-multiple-columns .hashtag-header .hashtag-header__header + div { + max-width: 55%; + line-height: 1.5; + margin-top: -2px; +} +.layout-multiple-columns .hashtag-header .hashtag-header__header + div > span { + display: inline-block; + margin-right: 5px; +} + @media screen and (min-width:890px) { .app-body .hashtag-header { border-left: 1px solid var(--color-lines); diff --git a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss index c0635ca..9ad64bb 100644 --- a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss +++ b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss @@ -84,6 +84,7 @@ --icon-ellipsis-active: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2Y3NjkwMiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0xNTYsMTI4YTI4LDI4LDAsMSwxLTI4LTI4QTI4LDI4LDAsMCwxLDE1NiwxMjhaTTQ4LDEwMGEyOCwyOCwwLDEsMCwyOCwyOEEyOCwyOCwwLDAsMCw0OCwxMDBabTE2MCwwYTI4LDI4LDAsMSwwLDI4LDI4QTI4LDI4LDAsMCwwLDIwOCwxMDBaIj48L3BhdGg+PC9zdmc+"); --icon-poll: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsOTJIMTgwVjU2YTEyLDEyLDAsMCwwLTEyLTEySDUyVjQwYTEyLDEyLDAsMCwwLTI0LDBWMjE2YTEyLDEyLDAsMCwwLDI0LDB2LTRoODRhMTIsMTIsMCwwLDAsMTItMTJWMTY0aDY4YTEyLDEyLDAsMCwwLDEyLTEyVjEwNEExMiwxMiwwLDAsMCwyMTYsOTJaTTE1Niw2OFY5Mkg1MlY2OFpNMTI0LDE4OEg1MlYxNjRoNzJabTgwLTQ4SDUyVjExNkgyMDRaIj48L3BhdGg+PC9zdmc+"); --icon-poll-accent: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2Y3NjkwMiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsMTA0djQ4SDQwVjEwNFoiIG9wYWNpdHk9IjAuMiI+PC9wYXRoPjxwYXRoIGQ9Ik0yMTYsOTZIMTc2VjU2YTgsOCwwLDAsMC04LThINDhWNDBhOCw4LDAsMCwwLTE2LDBWMjE2YTgsOCwwLDAsMCwxNiwwdi04aDg4YTgsOCwwLDAsMCw4LThWMTYwaDcyYTgsOCwwLDAsMCw4LThWMTA0QTgsOCwwLDAsMCwyMTYsOTZaTTE2MCw2NFY5Nkg0OFY2NFpNMTI4LDE5Mkg0OFYxNjBoODBabTgwLTQ4SDQ4VjExMkgyMDhaIj48L3BhdGg+PC9zdmc+"); + --icon-poll-active: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2ZmZmZmZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTEydjMyYTgsOCwwLDAsMS04LDhINDh2MTZoODhhOCw4LDAsMCwxLDgsOHYyNGE4LDgsMCwwLDEtOCw4SDQ4djhhOCw4LDAsMCwxLTE2LDBWNDBhOCw4LDAsMCwxLDE2LDB2OEgxNjhhOCw4LDAsMCwxLDgsOFY4MGE4LDgsMCwwLDEtOCw4SDQ4djE2SDIxNkE4LDgsMCwwLDEsMjI0LDExMloiPjwvcGF0aD48L3N2Zz4="); --icon-post: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiIHN0eWxlPSItLW5vaXItaW5saW5lLWZpbGw6ICNjOWM1YmU7IiBkYXRhLW5vaXItaW5saW5lLWZpbGw9IiI+PHBhdGggZD0iTTIyNCwxMjhBOTYsOTYsMCwwLDEsNzkuOTMsMjExLjExaDBMNDIuNTQsMjIzLjU4YTgsOCwwLDAsMS0xMC4xMi0xMC4xMmwxMi40Ny0zNy4zOWgwQTk2LDk2LDAsMSwxLDIyNCwxMjhaIiBvcGFjaXR5PSIwLjIiPjwvcGF0aD48cGF0aCBkPSJNMTI4LDI0QTEwNCwxMDQsMCwwLDAsMzYuMTgsMTc2Ljg4TDI0LjgzLDIxMC45M2ExNiwxNiwwLDAsMCwyMC4yNCwyMC4yNGwzNC4wNS0xMS4zNUExMDQsMTA0LDAsMSwwLDEyOCwyNFptMCwxOTJhODcuODcsODcuODcsMCwwLDEtNDQuMDYtMTEuODEsOCw4LDAsMCwwLTQtMS4wOCw3Ljg1LDcuODUsMCwwLDAtMi41My40Mkw0MCwyMTYsNTIuNDcsMTc4LjZhOCw4LDAsMCwwLS42Ni02LjU0QTg4LDg4LDAsMSwxLDEyOCwyMTZabTEyLTg4YTEyLDEyLDAsMSwxLTEyLTEyQTEyLDEyLDAsMCwxLDE0MCwxMjhabS00NCwwYTEyLDEyLDAsMSwxLTEyLTEyQTEyLDEyLDAsMCwxLDk2LDEyOFptODgsMGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSwxODQsMTI4WiI+PC9wYXRoPjwvc3ZnPg=="); --icon-post-notification: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzJhMmQzNyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0xMjAsMTI4YTE2LDE2LDAsMSwxLTE2LTE2QTE2LDE2LDAsMCwxLDEyMCwxMjhabTMyLTE2YTE2LDE2LDAsMSwwLDE2LDE2QTE2LDE2LDAsMCwwLDE1MiwxMTJabTg0LDE2QTEwOCwxMDgsMCwwLDEsNzguNzcsMjI0LjE1TDQ2LjM0LDIzNUEyMCwyMCwwLDAsMSwyMSwyMDkuNjZsMTAuODEtMzIuNDNBMTA4LDEwOCwwLDEsMSwyMzYsMTI4Wm0tMjQsMEE4NCw4NCwwLDEsMCw1NS4yNywxNzAuMDZhMTIsMTIsMCwwLDEsMSw5LjgxbC05LjkzLDI5Ljc5LDI5Ljc5LTkuOTNhMTIuMSwxMi4xLDAsMCwxLDMuOC0uNjIsMTIsMTIsMCwwLDEsNiwxLjYyQTg0LDg0LDAsMCwwLDIxMiwxMjhaIj48L3BhdGg+PC9zdmc+"); --icon-post-notification-accent: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2Y3NjkwMiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTI4QTk2LDk2LDAsMCwxLDc5LjkzLDIxMS4xMWgwTDQyLjU0LDIyMy41OGE4LDgsMCwwLDEtMTAuMTItMTAuMTJsMTIuNDctMzcuMzloMEE5Niw5NiwwLDEsMSwyMjQsMTI4WiIgb3BhY2l0eT0iMC4yIj48L3BhdGg+PHBhdGggZD0iTTEyOCwyNEExMDQsMTA0LDAsMCwwLDM2LjE4LDE3Ni44OEwyNC44MywyMTAuOTNhMTYsMTYsMCwwLDAsMjAuMjQsMjAuMjRsMzQuMDUtMTEuMzVBMTA0LDEwNCwwLDEsMCwxMjgsMjRabTAsMTkyYTg3Ljg3LDg3Ljg3LDAsMCwxLTQ0LjA2LTExLjgxLDgsOCwwLDAsMC00LTEuMDgsNy44NSw3Ljg1LDAsMCwwLTIuNTMuNDJMNDAsMjE2LDUyLjQ3LDE3OC42YTgsOCwwLDAsMC0uNjYtNi41NEE4OCw4OCwwLDEsMSwxMjgsMjE2Wm0xMi04OGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSwxNDAsMTI4Wm0tNDQsMGExMiwxMiwwLDEsMS0xMi0xMkExMiwxMiwwLDAsMSw5NiwxMjhabTg4LDBhMTIsMTIsMCwxLDEtMTItMTJBMTIsMTIsMCwwLDEsMTg0LDEyOFoiPjwvcGF0aD48L3N2Zz4="); @@ -801,6 +802,41 @@ body.app-body { } + +/* Links */ +.app-body a:is(.status-link, .mention, .navigation-bar__profile-edit) span, +.app-body :is(.account__header__fields, .account__header__content) a span { + text-decoration-line: underline; + text-decoration-color: var(--color-accent-bg); + text-decoration-thickness: 2px; + text-underline-offset: 2px; +} +.app-body a:is(.status-link, .mention, .navigation-bar__profile-edit):is(:active, :focus, :hover) span, +.app-body :is(.account__header__fields, .account__header__content, .trends__item__name) a:is(:active, :focus, :hover) span, +.app-body + :is( + .detailed-status__display-name, + .reply-indicator__display-name, + .status__display-name, + a.account__display-name + ):is(:active, :focus, :hover) + .display-name strong, +.app-body :is(.detailed-status__datetime, .status__relative-time):is(:active, :focus, :hover) { + text-decoration-line: underline; + text-decoration-color: currentColor; + text-decoration-thickness: 2px; + text-underline-offset: 2px; +} +.app-body a:is(.status-link, .mention):is(:active, :focus, :hover), +.app-body :is(.account__header__fields, .account__header__content) a:is(:active, :focus, :hover) { + text-decoration: none !important; +} +.app-body .account__header__fields .verified a span { + display: inline; +} + + + /* 📝 Compose panel ---------------- */ .app-body .compose-form { @@ -1240,7 +1276,8 @@ body.app-body { .app-body .status__content__text blockquote { color: var(--color-content-fg); border-color: var(--color-lines); -} +} + /* 📏 Post dividers */ /* Use ::before to set a non-full-width divider between posts and notifications. The divider sits above the post. */ @@ -1890,8 +1927,16 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .app-body .compose-form__poll-wrapper ul { background-color: var(--color-accent-bg); } -.app-body .compose-form__poll-wrapper .autosuggest-input input:focus { - box-shadow: 0 0 0 2px var(--color-accent); +.app-body .compose-form__poll-wrapper .autosuggest-input input, +.app-body .compose-form__poll-wrapper select { + background-color: var(--color-content-bg); + border: 1px solid var(--color-lines); + border-radius: 8px; + color: var(--color-content-fg); +} +.app-body .compose-form__poll-wrapper .autosuggest-input input:focus, +.app-body .compose-form__poll-wrapper select:focus { + border-color: var(--color-accent); } .app-body .compose-form__poll-wrapper .poll__footer .button.button-secondary { padding: 6px 16px; @@ -1900,6 +1945,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu color: transparent; pointer-events: none; } +.app-body .compose-form__poll-button .icon-button.active { + background-color: var(--color-accent); +} +.app-body .compose-form__poll-button .icon-button.active .icon-tasks { + background-image: var(--icon-poll-active); +} /* Empty columns */ @@ -2943,7 +2994,11 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu border-bottom-right-radius: 8px !important; } } -.app-body .columns-area__panels__main .trends__item { +.layout-multiple-columns .explore__links.scrollable { + background-color: var(--color-content-bg); + overflow-y: auto; +} +.app-body .explore__links .trends__item { background-color: var(--color-content-bg); border-bottom: 2px solid var(--color-content-secondary-bg); } @@ -2962,7 +3017,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu /* Hashtag header */ .app-body .hashtag-header { font-size: 15px; - padding: 22px 20px 24px; + padding: 24px 20px; color: var(--color-content-fg); background-color: var(--color-content-secondary-bg); border-top: 1px solid var(--color-lines); @@ -2981,12 +3036,27 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu margin-top: -5px; width: max-content; } - -@media screen and (min-width:890px) and (max-width:1174px) { - .app-body .hashtag-header { - margin-top: 15px; +@media screen and (max-width:460px) { + .app-body .hashtag-header .hashtag-header__header + div { + max-width: 55%; + line-height: 1.5; + margin-top: -2px; + } + .app-body .hashtag-header .hashtag-header__header + div > span { + display: inline-block; + margin-right: 5px; } } +.layout-multiple-columns .hashtag-header .hashtag-header__header + div { + max-width: 55%; + line-height: 1.5; + margin-top: -2px; +} +.layout-multiple-columns .hashtag-header .hashtag-header__header + div > span { + display: inline-block; + margin-right: 5px; +} + @media screen and (min-width:890px) { .app-body .hashtag-header { border-left: 1px solid var(--color-lines);