From 3d8abf92d9b55ec01c4761792ef5ed71ffc0fac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nil=C3=A9ane?= Date: Sun, 23 Jul 2023 12:00:37 +0200 Subject: [PATCH 1/3] Improved support for Mastodon's new dismissable banner --- TangerineUI-purple.css | 35 ++++++++++++++++++- TangerineUI.css | 35 ++++++++++++++++++- .../layout-single-column.scss | 35 ++++++++++++++++++- .../tangerineui/layout-single-column.scss | 35 ++++++++++++++++++- 4 files changed, 136 insertions(+), 4 deletions(-) diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css index c226cc0..fbf8aff 100644 --- a/TangerineUI-purple.css +++ b/TangerineUI-purple.css @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon ãƒģ Purple variant đŸĒģ - version: 1.7.4 + version: 1.8 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/ @@ -444,6 +444,12 @@ body.layout-single-column { .layout-single-column .fa-at.column-header__icon:before { content: var(--icon-direct-messages); } +.layout-single-column .fa-at.status__prepend-icon { + transform: scale(.7); +} +.layout-single-column .fa-at.status__prepend-icon::before { + content: var(--icon-direct-messages); +} /* Bookmarks icon */ .layout-single-column .column-link .fa-bookmark::before { content: var(--icon-bookmark-column-link); @@ -850,6 +856,7 @@ body.layout-single-column { padding-top: 2px; padding-left: 0; padding-right: 0; + margin-bottom: 0; height: 25px; color: var(--color-content-fg); } @@ -857,6 +864,9 @@ body.layout-single-column { width: 56px; text-align: right; } +.layout-single-column .detailed-status__wrapper .status__prepend-icon-wrapper { + width: 46px; +} .layout-single-column .status-card, .layout-single-column .status-card.compact { background-color: var(--color-content-secondary-bg); @@ -1009,6 +1019,7 @@ body.layout-single-column { .layout-single-column .follow_requests-unlocked_explanation { background-color: var(--color-accent-bg); color: var(--color-content-fg); + border-bottom: 0; } .layout-single-column .follow_requests-unlocked_explanation a { color: var(--color-accent); @@ -1865,6 +1876,28 @@ body.layout-single-column { .layout-single-column .dismissable-banner__action .icon-button { color: var(--color-accent-fg); } +.layout-single-column .dismissable-banner__message h1 { + color: var(--color-accent-fg); + margin-top: 10px; +} +.layout-single-column .dismissable-banner__message__actions__wrapper { + flex-flow: row-reverse; +} +.layout-single-column .dismissable-banner:has(.dismissable-banner__message > img:first-child) { + background: linear-gradient(to bottom, var(--color-accent), rgba(99, 99, 255, 0.4)); + padding-left: 10px; + padding-right: 10px; + margin-bottom: 2px; +} +.layout-single-column .dismissable-banner__background-image { + bottom: -35%; + opacity: .3; +} +.layout-single-column .dismissable-banner__message__actions .button, +.layout-single-column .dismissable-banner__message__actions .button.button-tertiary { + line-height: 28px; + padding: 6px 17px; +} diff --git a/TangerineUI.css b/TangerineUI.css index 57382eb..f88ae4f 100644 --- a/TangerineUI.css +++ b/TangerineUI.css @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon - version: 1.7.4 + version: 1.8 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/ @@ -444,6 +444,12 @@ body.layout-single-column { .layout-single-column .fa-at.column-header__icon:before { content: var(--icon-direct-messages); } +.layout-single-column .fa-at.status__prepend-icon { + transform: scale(.7); +} +.layout-single-column .fa-at.status__prepend-icon::before { + content: var(--icon-direct-messages); +} /* Bookmarks icon */ .layout-single-column .column-link .fa-bookmark::before { content: var(--icon-bookmark-column-link); @@ -850,6 +856,7 @@ body.layout-single-column { padding-top: 2px; padding-left: 0; padding-right: 0; + margin-bottom: 0; height: 25px; color: var(--color-content-fg); } @@ -857,6 +864,9 @@ body.layout-single-column { width: 56px; text-align: right; } +.layout-single-column .detailed-status__wrapper .status__prepend-icon-wrapper { + width: 46px; +} .layout-single-column .status-card, .layout-single-column .status-card.compact { background-color: var(--color-content-secondary-bg); @@ -1009,6 +1019,7 @@ body.layout-single-column { .layout-single-column .follow_requests-unlocked_explanation { background-color: var(--color-accent-bg); color: var(--color-content-fg); + border-bottom: 0; } .layout-single-column .follow_requests-unlocked_explanation a { color: var(--color-accent); @@ -1865,6 +1876,28 @@ body.layout-single-column { .layout-single-column .dismissable-banner__action .icon-button { color: var(--color-accent-fg); } +.layout-single-column .dismissable-banner__message h1 { + color: var(--color-accent-fg); + margin-top: 10px; +} +.layout-single-column .dismissable-banner__message__actions__wrapper { + flex-flow: row-reverse; +} +.layout-single-column .dismissable-banner:has(.dismissable-banner__message > img:first-child) { + background: linear-gradient(to bottom, var(--color-accent), rgba(247, 105, 2, 0.4)); + padding-left: 10px; + padding-right: 10px; + margin-bottom: 2px; +} +.layout-single-column .dismissable-banner__background-image { + bottom: -35%; + opacity: .3; +} +.layout-single-column .dismissable-banner__message__actions .button, +.layout-single-column .dismissable-banner__message__actions .button.button-tertiary { + line-height: 28px; + padding: 6px 17px; +} 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 c226cc0..fbf8aff 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon ãƒģ Purple variant đŸĒģ - version: 1.7.4 + version: 1.8 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/ @@ -444,6 +444,12 @@ body.layout-single-column { .layout-single-column .fa-at.column-header__icon:before { content: var(--icon-direct-messages); } +.layout-single-column .fa-at.status__prepend-icon { + transform: scale(.7); +} +.layout-single-column .fa-at.status__prepend-icon::before { + content: var(--icon-direct-messages); +} /* Bookmarks icon */ .layout-single-column .column-link .fa-bookmark::before { content: var(--icon-bookmark-column-link); @@ -850,6 +856,7 @@ body.layout-single-column { padding-top: 2px; padding-left: 0; padding-right: 0; + margin-bottom: 0; height: 25px; color: var(--color-content-fg); } @@ -857,6 +864,9 @@ body.layout-single-column { width: 56px; text-align: right; } +.layout-single-column .detailed-status__wrapper .status__prepend-icon-wrapper { + width: 46px; +} .layout-single-column .status-card, .layout-single-column .status-card.compact { background-color: var(--color-content-secondary-bg); @@ -1009,6 +1019,7 @@ body.layout-single-column { .layout-single-column .follow_requests-unlocked_explanation { background-color: var(--color-accent-bg); color: var(--color-content-fg); + border-bottom: 0; } .layout-single-column .follow_requests-unlocked_explanation a { color: var(--color-accent); @@ -1865,6 +1876,28 @@ body.layout-single-column { .layout-single-column .dismissable-banner__action .icon-button { color: var(--color-accent-fg); } +.layout-single-column .dismissable-banner__message h1 { + color: var(--color-accent-fg); + margin-top: 10px; +} +.layout-single-column .dismissable-banner__message__actions__wrapper { + flex-flow: row-reverse; +} +.layout-single-column .dismissable-banner:has(.dismissable-banner__message > img:first-child) { + background: linear-gradient(to bottom, var(--color-accent), rgba(99, 99, 255, 0.4)); + padding-left: 10px; + padding-right: 10px; + margin-bottom: 2px; +} +.layout-single-column .dismissable-banner__background-image { + bottom: -35%; + opacity: .3; +} +.layout-single-column .dismissable-banner__message__actions .button, +.layout-single-column .dismissable-banner__message__actions .button.button-tertiary { + line-height: 28px; + padding: 6px 17px; +} diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss index 57382eb..f88ae4f 100644 --- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon - version: 1.7.4 + version: 1.8 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/ @@ -444,6 +444,12 @@ body.layout-single-column { .layout-single-column .fa-at.column-header__icon:before { content: var(--icon-direct-messages); } +.layout-single-column .fa-at.status__prepend-icon { + transform: scale(.7); +} +.layout-single-column .fa-at.status__prepend-icon::before { + content: var(--icon-direct-messages); +} /* Bookmarks icon */ .layout-single-column .column-link .fa-bookmark::before { content: var(--icon-bookmark-column-link); @@ -850,6 +856,7 @@ body.layout-single-column { padding-top: 2px; padding-left: 0; padding-right: 0; + margin-bottom: 0; height: 25px; color: var(--color-content-fg); } @@ -857,6 +864,9 @@ body.layout-single-column { width: 56px; text-align: right; } +.layout-single-column .detailed-status__wrapper .status__prepend-icon-wrapper { + width: 46px; +} .layout-single-column .status-card, .layout-single-column .status-card.compact { background-color: var(--color-content-secondary-bg); @@ -1009,6 +1019,7 @@ body.layout-single-column { .layout-single-column .follow_requests-unlocked_explanation { background-color: var(--color-accent-bg); color: var(--color-content-fg); + border-bottom: 0; } .layout-single-column .follow_requests-unlocked_explanation a { color: var(--color-accent); @@ -1865,6 +1876,28 @@ body.layout-single-column { .layout-single-column .dismissable-banner__action .icon-button { color: var(--color-accent-fg); } +.layout-single-column .dismissable-banner__message h1 { + color: var(--color-accent-fg); + margin-top: 10px; +} +.layout-single-column .dismissable-banner__message__actions__wrapper { + flex-flow: row-reverse; +} +.layout-single-column .dismissable-banner:has(.dismissable-banner__message > img:first-child) { + background: linear-gradient(to bottom, var(--color-accent), rgba(247, 105, 2, 0.4)); + padding-left: 10px; + padding-right: 10px; + margin-bottom: 2px; +} +.layout-single-column .dismissable-banner__background-image { + bottom: -35%; + opacity: .3; +} +.layout-single-column .dismissable-banner__message__actions .button, +.layout-single-column .dismissable-banner__message__actions .button.button-tertiary { + line-height: 28px; + padding: 6px 17px; +} From 9aadd66bab643ca5fbf003cc6cf2ea35dcde42dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nil=C3=A9ane?= Date: Sun, 23 Jul 2023 17:37:10 +0200 Subject: [PATCH 2/3] Removed selector that hid Explore tab for logged out users if unauthenticated access to public timelines was disabled --- TangerineUI-purple.css | 1 - TangerineUI.css | 1 - .../styles/tangerineui-purple/layout-single-column.scss | 1 - .../app/javascript/styles/tangerineui/layout-single-column.scss | 1 - 4 files changed, 4 deletions(-) diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css index fbf8aff..5648209 100644 --- a/TangerineUI-purple.css +++ b/TangerineUI-purple.css @@ -2686,7 +2686,6 @@ body.layout-single-column { /* 👋 Hide superfluous UI */ .layout-single-column div#mastodon > div > div > div:nth-child(2) > div:nth-child(3) > div > div > div:nth-child(3) > hr, .layout-single-column .navigation-panel__legal > hr, -.layout-single-column .navigation-panel > .column-link:only-of-type, /* Hide Explore tab for logged-out users */ .layout-single-column .navigation-panel__sign-in-banner + .navigation-panel__legal + .flex-spacer + .getting-started__trends, /* Hide Trending section for logged-out users */ .layout-single-column .about__footer, /* Hide meta footer */ .layout-single-column .server-banner__introduction, /* Hide generic mastodon server introduction in sidebar */ diff --git a/TangerineUI.css b/TangerineUI.css index f88ae4f..1acdd90 100644 --- a/TangerineUI.css +++ b/TangerineUI.css @@ -2686,7 +2686,6 @@ body.layout-single-column { /* 👋 Hide superfluous UI */ .layout-single-column div#mastodon > div > div > div:nth-child(2) > div:nth-child(3) > div > div > div:nth-child(3) > hr, .layout-single-column .navigation-panel__legal > hr, -.layout-single-column .navigation-panel > .column-link:only-of-type, /* Hide Explore tab for logged-out users */ .layout-single-column .navigation-panel__sign-in-banner + .navigation-panel__legal + .flex-spacer + .getting-started__trends, /* Hide Trending section for logged-out users */ .layout-single-column .about__footer, /* Hide meta footer */ .layout-single-column .server-banner__introduction, /* Hide generic mastodon server introduction in sidebar */ 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 fbf8aff..5648209 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss @@ -2686,7 +2686,6 @@ body.layout-single-column { /* 👋 Hide superfluous UI */ .layout-single-column div#mastodon > div > div > div:nth-child(2) > div:nth-child(3) > div > div > div:nth-child(3) > hr, .layout-single-column .navigation-panel__legal > hr, -.layout-single-column .navigation-panel > .column-link:only-of-type, /* Hide Explore tab for logged-out users */ .layout-single-column .navigation-panel__sign-in-banner + .navigation-panel__legal + .flex-spacer + .getting-started__trends, /* Hide Trending section for logged-out users */ .layout-single-column .about__footer, /* Hide meta footer */ .layout-single-column .server-banner__introduction, /* Hide generic mastodon server introduction in sidebar */ diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss index f88ae4f..1acdd90 100644 --- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss @@ -2686,7 +2686,6 @@ body.layout-single-column { /* 👋 Hide superfluous UI */ .layout-single-column div#mastodon > div > div > div:nth-child(2) > div:nth-child(3) > div > div > div:nth-child(3) > hr, .layout-single-column .navigation-panel__legal > hr, -.layout-single-column .navigation-panel > .column-link:only-of-type, /* Hide Explore tab for logged-out users */ .layout-single-column .navigation-panel__sign-in-banner + .navigation-panel__legal + .flex-spacer + .getting-started__trends, /* Hide Trending section for logged-out users */ .layout-single-column .about__footer, /* Hide meta footer */ .layout-single-column .server-banner__introduction, /* Hide generic mastodon server introduction in sidebar */ From 6ba2b10ef17d2c14417670e890778ce81bd2dd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nil=C3=A9ane?= Date: Sun, 23 Jul 2023 18:09:37 +0200 Subject: [PATCH 3/3] v1.7.5 --- TangerineUI-purple.css | 2 +- TangerineUI.css | 2 +- .../styles/tangerineui-purple/layout-single-column.scss | 2 +- .../app/javascript/styles/tangerineui/layout-single-column.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css index 5648209..7712a70 100644 --- a/TangerineUI-purple.css +++ b/TangerineUI-purple.css @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon ãƒģ Purple variant đŸĒģ - version: 1.8 + version: 1.7.5 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/ diff --git a/TangerineUI.css b/TangerineUI.css index 1acdd90..dcc31f3 100644 --- a/TangerineUI.css +++ b/TangerineUI.css @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon - version: 1.8 + version: 1.7.5 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/ 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 5648209..7712a70 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon ãƒģ Purple variant đŸĒģ - version: 1.8 + version: 1.7.5 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/ diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss index 1acdd90..dcc31f3 100644 --- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss @@ -1,5 +1,5 @@ /* TangerineUI 🍊 for Mastodon - version: 1.8 + version: 1.7.5 A Tangerine redesign for Mastodon's Web UI. https://github.com/nileane/TangerineUI-for-Mastodon/