From 550b8415ed5f847f641d0bff9d88b41baf0a0fc3 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 15:53:01 +0200 Subject: [PATCH 01/17] Fix navigation issues in nightly 2024-11-09 --- layout-single-column.css | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/layout-single-column.css b/layout-single-column.css index 68103de..9120e15 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -4517,30 +4517,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu color: transparent; } -/* More compact header on mobile, thanks for the idea @nileane@nileane.fr! https://github.com/nileane/TangerineUI-for-Mastodon */ +/* Header on mobile */ @media screen and (max-width: 1174px) { - .app-body:not(.layout-multiple-columns) .ui__header { - background-color: transparent; - border-bottom: 0; - } - .app-body:not(.layout-multiple-columns) .ui__header .ui__header__logo { margin-left: 3px; } - .app-body:not(.layout-multiple-columns) .tabs-bar__wrapper { - border-bottom: 0; - border-radius: 0; - box-shadow: none; - display: block; - height: 55px; - inset-inline-end: 105px; - inset-inline-start: 45px; - margin-bottom: -2px; - position: fixed; - top: 0; - } - /* stylelint-disable-next-line */ .app-body:not(.layout-multiple-columns):not(:has(.ui .ui__header__links > .button[href="/auth/sign_in"])) .tabs-bar__wrapper { z-index: 3; @@ -4567,19 +4549,29 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu display: none; } + .app-body:not(.layout-multiple-columns) .columns-area__panels { + z-index: 2; + } + /* Set a backdrop blur background to both top bars */ - .app-body:not(.layout-multiple-columns) .ui::after { + .app-body:not(.layout-multiple-columns) .ui__header { + background-color: var(--color-bg-75); + height: 55px; + z-index: 5; + } + + .app-body:not(.layout-multiple-columns) .tabs-bar__wrapper::after { /* stylelint-disable-next-line */ -webkit-backdrop-filter: blur(20px); backdrop-filter: blur(20px); - border-bottom: 1px solid var(--color-border); + background-color: var(--color-bg-75); content: ""; height: 55px; left: 0; - position: fixed; + position: absolute; top: 0; width: 100%; - z-index: 1; + z-index: 0; } /* Remove margin between column settings and column header */ From 0d271eefc6dba68765e625c28362a13981cf4ff2 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 15:55:36 +0200 Subject: [PATCH 02/17] Use active color instead of rotate in settings icon --- layout-single-column.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/layout-single-column.css b/layout-single-column.css index 9120e15..7e8f23e 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -3750,6 +3750,14 @@ body .compose-form .compose-form__uploads { background-image: var(--icon-sliders); } +.column-header__button.active .icon-sliders { + /* Use contrast icon */ + background-image: var(--icon-sliders-contrast); + + /* Disable rotate */ + transform: none; +} + /* Administration icon */ .layout-single-column .column-link .icon-tachometer { --size-icon: 24px; From baf632b9fd3f8298ddcdd4a6fb45fdcfa812cae3 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 15:57:50 +0200 Subject: [PATCH 03/17] More unified background and borders in the settings boxes --- layout-single-column.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/layout-single-column.css b/layout-single-column.css index 7e8f23e..5498d17 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -790,9 +790,17 @@ body.layout-single-column { color: var(--color-light-text); } +/* Setting boxes */ +.layout-single-column .column-header__collapsible-inner { + background-color: var(--color-bg); + border-color: var(--color-border); +} + /* Column-header border */ .layout-single-column .column-header__collapsible { border-bottom: 1px solid var(--color-border); + border-left: 0; + border-right: 0; } .layout-single-column .column-header__collapsible, From 561e0c49f9111f1a61c4976b7d57169dc0330863 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 16:46:38 +0200 Subject: [PATCH 04/17] Fix issues with the nav bar in 2024-11-09 --- layout-single-column.css | 46 ++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/layout-single-column.css b/layout-single-column.css index 5498d17..8f5e269 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -24,6 +24,7 @@ and replace it inside the SVG icons if you decide to change it */ --color-bg: var(--color-brand-mastodon-bg); --color-bg-75: #1e2028bf; + --color-bg-90: #1e2028e6; --color-fg: #fff; --color-border: #38384d; --color-dim: var(--color-brand-mastodon-dim); @@ -275,6 +276,7 @@ body.theme-mastodon-light.layout-single-column { --color-light-purple: #9588a6; --color-dark-electric-blue: #9088a6; --color-bg-75: #ffffffbf; + --color-bg-90: #ffffffe6; --color-accent: var(--color-accent-dark); --color-ghost-button-text: var(--color-accent-dark); --color-bg-compose-form: rgb(147 136 166 / .2); @@ -1490,9 +1492,8 @@ body.embed .detailed-status__display-avatar > img, border: 0; } -/* Nice active effect in the column header */ .layout-single-column .column-header__wrapper.active { - box-shadow: var(--active-header-box-shadow); + box-shadow: none; } .layout-single-column .column-header__wrapper.active::before { @@ -4015,7 +4016,6 @@ body .compose-form .compose-form__uploads { /* Mobile */ @media screen and (max-width: 889px) { - /* Better blur overlay for ui-header */ .layout-single-column .ui::after { backdrop-filter: blur(12px); @@ -4548,19 +4548,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu display: none; } - .app-body:not(.layout-multiple-columns) - :is( - .column-header, - .column-back-button, - .column-header__button, - .column-header__back-button - ) { - background-color: transparent; - border: 0; - height: 55px; - margin: 0; - } - .app-body .column-header__icon { display: none; } @@ -4571,18 +4558,15 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu /* Set a backdrop blur background to both top bars */ .app-body:not(.layout-multiple-columns) .ui__header { - background-color: var(--color-bg-75); + background-color: var(--color-bg-90); height: 55px; z-index: 5; } .app-body:not(.layout-multiple-columns) .tabs-bar__wrapper::after { - /* stylelint-disable-next-line */ - -webkit-backdrop-filter: blur(20px); - backdrop-filter: blur(20px); - background-color: var(--color-bg-75); + background-color: var(--color-bg-90); content: ""; - height: 55px; + height: 49px; left: 0; position: absolute; top: 0; @@ -4590,16 +4574,22 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu z-index: 0; } - /* Remove margin between column settings and column header */ - .app-body:not(.layout-multiple-columns) .column-header__collapsible { - left: 0; - position: fixed; - right: 0; + .ui:has([href="/auth/sign_in"]) .tabs-bar__wrapper::after, + .ui:has(.compose-form__submit) .tabs-bar__wrapper::after { + display: none; } - .app-body:not(.layout-multiple-columns) .column-header__collapsible:not(.collapsed) { + .layout-single-column .column-header__collapsible { border-bottom: 1px solid var(--color-border); } + + .layout-single-column .column-header__collapsible-inner { + background-color: var(--color-bg-90); + } + + .app-body:not(.layout-multiple-columns) .column-header__collapsible:not(.collapsed) { + border-bottom: 0; + } } /* List panel */ From 5b8f38af36726b0db1fa17929d4485ee5ce380c8 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 16:48:45 +0200 Subject: [PATCH 05/17] Fix issues with the nav bar in 2024-11-09 --- CHANGELOG.md | 8 ++++++++ layout-multiple-columns.css | 2 +- layout-single-column.css | 2 +- package.json | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf57881..61ee9f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +### 2.0.6rc: 2024-11-10 + +* Fix issues with the nav bar in 2024-11-09 +* More unified background and borders in the settings boxes +* Use active color instead of rotate in settings icon +* Fix navigation issues in nightly 2024-11-09 +* Remove stylelint recommended, fix unknown rule + ### 2.0.5: 2024-11-10 * Add unit test to test for CSS syntax errors #141 diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index 0b7e193..a55449c 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.5 */ + 2.0.6rc */ /* CSS variables */ :root { diff --git a/layout-single-column.css b/layout-single-column.css index 8f5e269..1dea452 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.5 */ + 2.0.6rc */ /* CSS variables */ :root { diff --git a/package.json b/package.json index d54e3a7..022aed8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mastodon-bird-ui", - "version": "2.0.5", + "version": "2.0.6rc", "description": "", "main": "index.js", "scripts": { @@ -20,4 +20,4 @@ "stylelint-order": "^6.0.3" }, "dependencies": {} -} +} \ No newline at end of file From f9f50729890d4842bec2fa40976ef6be26558313 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 16:50:16 +0200 Subject: [PATCH 06/17] Implement changes to advanced view as well --- layout-multiple-columns.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index a55449c..b0d6b7f 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -783,6 +783,12 @@ body.layout-multiple-columns { color: var(--color-light-text); } +/* Setting boxes */ +.layout-multiple-columns .column-header__collapsible-inner { + background-color: var(--color-bg); + border-color: var(--color-border); +} + /* Column-header border */ .layout-multiple-columns .column-header__collapsible { border-bottom: 1px solid var(--color-border); @@ -3449,6 +3455,13 @@ body .compose-form .compose-form__uploads { background-image: var(--icon-sliders); } +.layout-multiple-columns .column-header__button.active .icon-sliders { + /* Use contrast icon */ + background-image: var(--icon-sliders-contrast); + /* Disable rotate */ + transform: none; +} + /* Administration icon */ .layout-multiple-columns .column-link .icon-tachometer { --size-icon: 24px; From 6f400630ff46f04a23188879196eac9fb4bd2301 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 20:46:42 +0200 Subject: [PATCH 07/17] Fix numbered heart animation in advanced view --- CHANGELOG.md | 4 ++++ layout-multiple-columns.css | 10 +++++++++- layout-single-column.css | 4 ++-- package.json | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61ee9f4..bd21ecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.0.6rc2: 2024-11-10 + +* Fix numbered heart animation in advanced view (thanks @stedi!) + ### 2.0.6rc: 2024-11-10 * Fix issues with the nav bar in 2024-11-09 diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index b0d6b7f..8ad8cdf 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc */ + 2.0.6rc2 */ /* CSS variables */ :root { @@ -4327,6 +4327,14 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu height: 25.5px; } +.layout-multiple-columns.no-reduce-motion .star-icon.icon-button--with-counter .icon-button__counter { + margin-left: 20px; +} + +.animated-number { + z-index: 99; +} + @media screen and (max-width: 889px) { /* stylelint-disable-next-line */ .layout-multiple-columns.no-reduce-motion .status .icon-button.star-icon.activate .icon-star { diff --git a/layout-single-column.css b/layout-single-column.css index 1dea452..13a9707 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc */ + 2.0.6rc2 */ /* CSS variables */ :root { @@ -4762,7 +4762,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu position: absolute; } -.star-icon.icon-button--with-counter .icon-button__counter { +.layout-single-column.no-reduce-motion .star-icon.icon-button--with-counter .icon-button__counter { margin-left: 20px; } diff --git a/package.json b/package.json index 022aed8..b477253 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mastodon-bird-ui", - "version": "2.0.6rc", + "version": "2.0.6rc2", "description": "", "main": "index.js", "scripts": { From becb75d6e4b8311fd00fdbf7dc9ca1b71dbdbc82 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 20:51:02 +0200 Subject: [PATCH 08/17] Fix media gallery margin in advanced view --- CHANGELOG.md | 1 + layout-multiple-columns.css | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd21ecb..79ef697 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### 2.0.6rc2: 2024-11-10 * Fix numbered heart animation in advanced view (thanks @stedi!) +* Fix media gallery margin in advanced view ### 2.0.6rc: 2024-11-10 diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index 8ad8cdf..afa2f3c 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -1665,6 +1665,16 @@ body.embed .detailed-status, width: 100% !important; } +.layout-multiple-columns .media-gallery__gifv, +.layout-multiple-columns .media-gallery__preview, +.layout-multiple-columns .detailed-status .audio-player, +.layout-multiple-columns .detailed-status .media-gallery, +.layout-multiple-columns .detailed-status .media-gallery__gifv, +.layout-multiple-columns .detailed-status .media-gallery__preview, +.layout-multiple-columns .detailed-status .video-player { + margin-left: 0; +} + .layout-multiple-columns .media-gallery__preview { /* stylelint-disable-next-line */ margin-left: 0 !important; From af42c2b33b1952955a1b24c76c595dd1a6095fa7 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 20:57:05 +0200 Subject: [PATCH 09/17] Fix numbered heart animation in advanced view --- layout-multiple-columns.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index afa2f3c..f673510 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -4337,7 +4337,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu height: 25.5px; } -.layout-multiple-columns.no-reduce-motion .star-icon.icon-button--with-counter .icon-button__counter { +.layout-multiple-columns.no-reduce-motion .star-icon.icon-button--with-counter.activate .icon-button__counter { margin-left: 20px; } From cd4b8e341ba14b607e6160e29dc05ac070252239 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sun, 10 Nov 2024 21:12:04 +0200 Subject: [PATCH 10/17] Fix imageless article cards don't display correctly, Fixes #137 --- CHANGELOG.md | 4 ++++ layout-multiple-columns.css | 7 +------ layout-single-column.css | 7 +------ package.json | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79ef697..c7a91c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.0.6rc3: 2024-11-10 + +* Fix imageless article cards don't display correctly, Fixes #137 (thanks @AlternateRT!) + ### 2.0.6rc2: 2024-11-10 * Fix numbered heart animation in advanced view (thanks @stedi!) diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index f673510..45aff6a 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc2 */ + 2.0.6rc3 */ /* CSS variables */ :root { @@ -669,11 +669,6 @@ body.layout-multiple-columns { display: inherit; } -/* Hide empty status cards alltogether (Mastodon 4.1.5-2023-07-29) */ -.layout-multiple-columns .status-card:has(.icon-file-text) { - display: none; -} - /* Hide empty YouTube description */ .layout-multiple-columns .status-card__description:empty { display: none; diff --git a/layout-single-column.css b/layout-single-column.css index 13a9707..e6a6fc2 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc2 */ + 2.0.6rc3 */ /* CSS variables */ :root { @@ -685,11 +685,6 @@ body.layout-single-column { display: inherit; } -/* Hide empty status cards alltogether (Mastodon 4.1.5-2023-07-29) */ -.layout-single-column .status-card:has(.icon-file-text) { - display: none; -} - /* Hide empty YouTube description */ .layout-single-column .status-card__description:empty { display: none; diff --git a/package.json b/package.json index b477253..4ceffdd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mastodon-bird-ui", - "version": "2.0.6rc2", + "version": "2.0.6rc3", "description": "", "main": "index.js", "scripts": { From 5ab112c7cb61de36c0c434e3da02637adf6cc50b Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sat, 23 Nov 2024 13:35:41 +0200 Subject: [PATCH 11/17] Fix star icon misalignment in Mastoodn v4.4.0-alpha.1 --- CHANGELOG.md | 4 ++++ layout-multiple-columns.css | 5 ++--- layout-single-column.css | 5 ++--- package.json | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7a91c3..64776a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.0.6rc4: 2024-11-10 + +* Fix star icon misalignment in Mastoodn v4.4.0-alpha.1 + ### 2.0.6rc3: 2024-11-10 * Fix imageless article cards don't display correctly, Fixes #137 (thanks @AlternateRT!) diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index 45aff6a..1b7a37b 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc3 */ + 2.0.6rc4 */ /* CSS variables */ :root { @@ -4293,7 +4293,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu background-size: unset; /* stylelint-disable-next-line */ content: '' !important; - height: 100px; left: -38px; pointer-events: none; position: absolute; @@ -4539,7 +4538,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .layout-multiple-columns button.icon-button.icon-button--with-counter.activate.star-icon > .icon-star { position: absolute !important; top: unset !important; - left: -34px !important; + left: -40px !important; } @media (hover: none) { diff --git a/layout-single-column.css b/layout-single-column.css index e6a6fc2..59412fd 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc3 */ + 2.0.6rc4 */ /* CSS variables */ :root { @@ -4712,7 +4712,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu background-size: unset; /* stylelint-disable-next-line */ content: '' !important; - height: 100px; left: -38px; pointer-events: none; position: absolute; @@ -4966,7 +4965,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu } .layout-single-column button.icon-button.icon-button--with-counter.activate.star-icon > .icon-star { - left: -34px !important; + left: -40px !important; position: absolute !important; top: unset !important; } diff --git a/package.json b/package.json index 4ceffdd..00fd38e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mastodon-bird-ui", - "version": "2.0.6rc3", + "version": "2.0.6rc4", "description": "", "main": "index.js", "scripts": { From f181528d0c591af9b901b4c7f22c52295f5829ab Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sat, 23 Nov 2024 14:16:20 +0200 Subject: [PATCH 12/17] Re-introduce star fix --- layout-multiple-columns.css | 2 +- layout-single-column.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index 1b7a37b..0238048 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -4536,9 +4536,9 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu } .layout-multiple-columns button.icon-button.icon-button--with-counter.activate.star-icon > .icon-star { + left: 0 !important; position: absolute !important; top: unset !important; - left: -40px !important; } @media (hover: none) { diff --git a/layout-single-column.css b/layout-single-column.css index 59412fd..08d630b 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -4965,7 +4965,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu } .layout-single-column button.icon-button.icon-button--with-counter.activate.star-icon > .icon-star { - left: -40px !important; + left: 0 !important; position: absolute !important; top: unset !important; } From 30e316c667eaa0868f7c5376812fdfab2585f68f Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sat, 23 Nov 2024 14:19:41 +0200 Subject: [PATCH 13/17] Fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64776a8..8c9e906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### 2.0.6rc4: 2024-11-10 -* Fix star icon misalignment in Mastoodn v4.4.0-alpha.1 +* Fix star icon misalignment in Mastodon v4.4.0-alpha.1 ### 2.0.6rc3: 2024-11-10 From 6cfe977d99eac6c8da8b1680abeea2d9c0626d35 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sat, 23 Nov 2024 14:27:45 +0200 Subject: [PATCH 14/17] Fix regression with heart icon --- layout-multiple-columns.css | 2 ++ layout-single-column.css | 2 ++ 2 files changed, 4 insertions(+) diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index 0238048..9486880 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -4299,6 +4299,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu top: -38px; transform: scale(.58); width: 100px; + height: 100px; } @media (prefers-reduced-motion: no-preference) { @@ -4419,6 +4420,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu top: 0; transform: none; width: unset; + height: unset !important; } .layout-multiple-columns.no-reduce-motion .icon-button.star-icon.active .icon-star { diff --git a/layout-single-column.css b/layout-single-column.css index 08d630b..c85e7f0 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -4718,6 +4718,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu top: -37px; transform: scale(.58); width: 100px; + height: 100px; } @media (max-width: 890px) { @@ -4848,6 +4849,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu top: 0; transform: none; width: unset; + height: unset !important; } .layout-single-column.no-reduce-motion .icon-button.star-icon.active .icon-star { From 69a54e24da61a0e238a87e587f2e38219c4f85ad Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sat, 23 Nov 2024 18:29:10 +0200 Subject: [PATCH 15/17] Fix build --- layout-multiple-columns.css | 2 +- layout-single-column.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index 9486880..046ee16 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -4293,13 +4293,13 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu background-size: unset; /* stylelint-disable-next-line */ content: '' !important; + height: 100px; left: -38px; pointer-events: none; position: absolute; top: -38px; transform: scale(.58); width: 100px; - height: 100px; } @media (prefers-reduced-motion: no-preference) { diff --git a/layout-single-column.css b/layout-single-column.css index c85e7f0..221be3e 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -4712,13 +4712,13 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu background-size: unset; /* stylelint-disable-next-line */ content: '' !important; + height: 100px; left: -38px; pointer-events: none; position: absolute; top: -37px; transform: scale(.58); width: 100px; - height: 100px; } @media (max-width: 890px) { From fa453451d1dac00e9a857cd3ad7c23034ca1d3a7 Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sat, 7 Dec 2024 13:06:33 +0200 Subject: [PATCH 16/17] Declare correct version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45a16a5..ce56a35 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Mastodon with modern birdsite-like UI -[![Build Status for CSS](https://github.com/ronilaukkarinen/mastodon-bird-ui/actions/workflows/styles.yml/badge.svg)](https://github.com/ronilaukkarinen/mastodon-bird-ui/actions/workflows/styles.yml) [![Supported Mastodon version](https://img.shields.io/badge/mastodon-v4.3.0-595aff)](https://github.com/mastodon/mastodon) GitHub Sponsor Ko-fi +[![Build Status for CSS](https://github.com/ronilaukkarinen/mastodon-bird-ui/actions/workflows/styles.yml/badge.svg)](https://github.com/ronilaukkarinen/mastodon-bird-ui/actions/workflows/styles.yml) [![Supported Mastodon version](https://img.shields.io/badge/mastodon-v4.4.0--alpha-595aff)](https://github.com/mastodon/mastodon) GitHub Sponsor Ko-fi Blasphemy! Yes, I know, but I just had to do this. I wanted to see if it's possible to get Mastodon default user interface to resemble Twitter, but be a lot better than it ever was. From f658af000800cd856e64a229a50025980ab1151b Mon Sep 17 00:00:00 2001 From: Roni Laukkarinen Date: Sat, 7 Dec 2024 13:01:51 +0200 Subject: [PATCH 17/17] Fix top bar showing up when there is no column header title --- CHANGELOG.md | 4 ++++ layout-multiple-columns.css | 2 +- layout-single-column.css | 4 ++-- package.json | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c9e906..fa201df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.0.6rc5: 2024-12-07 + +* Fix top bar showing up when there is no column header title (thanks @ikkeT!) + ### 2.0.6rc4: 2024-11-10 * Fix star icon misalignment in Mastodon v4.4.0-alpha.1 diff --git a/layout-multiple-columns.css b/layout-multiple-columns.css index 046ee16..585d503 100644 --- a/layout-multiple-columns.css +++ b/layout-multiple-columns.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc4 */ + 2.0.6rc5 */ /* CSS variables */ :root { diff --git a/layout-single-column.css b/layout-single-column.css index 221be3e..cfc3c5c 100644 --- a/layout-single-column.css +++ b/layout-single-column.css @@ -1,5 +1,5 @@ /* Mastodon Bird UI by @rolle@mementomori.social - 2.0.6rc4 */ + 2.0.6rc5 */ /* CSS variables */ :root { @@ -4558,7 +4558,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu z-index: 5; } - .app-body:not(.layout-multiple-columns) .tabs-bar__wrapper::after { + .app-body:not(.layout-multiple-columns):has(.column-header__title) .tabs-bar__wrapper::after { background-color: var(--color-bg-90); content: ""; height: 49px; diff --git a/package.json b/package.json index 00fd38e..f933a60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mastodon-bird-ui", - "version": "2.0.6rc4", + "version": "2.0.6rc5", "description": "", "main": "index.js", "scripts": { @@ -20,4 +20,4 @@ "stylelint-order": "^6.0.3" }, "dependencies": {} -} \ No newline at end of file +}