Fix bird-ui-accessible theme

dhelonious · Jan 31, 2025 · 5b49b03 · 5b49b03
1 parent b742098
commit 5b49b03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -936,7 +936,6 @@ parts:
       echo -e "@import 'contrast/variables';\n@import 'application';\n@import 'contrast/diff';\n@import 'mastodon-bird-ui/layout-single-column.scss';\n@import 'mastodon-bird-ui/layout-multiple-columns.scss';" > $MASTODON_STYLES/mastodon-bird-ui-contrast.scss
       echo -e "mastodon-bird-ui-contrast: styles/mastodon-bird-ui-contrast.scss" >> $CRAFT_STAGE/mastodon/config/themes.yml
       cat $MASTODON_STYLES/mastodon-bird-ui-contrast.scss $CRAFT_STAGE/themes/mastodon-bird-ui/accessible.scss > $MASTODON_STYLES/mastodon-bird-ui-accessible.scss
-      echo -e "mastodon-bird-ui-accessible: styles/mastodon-bird-ui-accessible.scss" >> $CRAFT_STAGE/mastodon/config/themes.yml
 
       for locale in $CRAFT_STAGE/mastodon/config/locales/*.yml; do
         sed -i "s/default: Mastodon (\(.*\))/&\n    mastodon-bird-ui-dark: Mastodon Bird UI (\1)/" $locale

diff --git a/src/mastodon/themes/mastodon-bird-ui/accessible.scss b/src/mastodon/themes/mastodon-bird-ui/accessible.scss
@@ -1,12 +1,6 @@
 /* https://github.com/ronilaukkarinen/mastodon/blob/df33146e3fe1d0d3d1ba1bc045228ff2054f8714/app/javascript/styles/mastodon-bird-ui-accessible-plus.scss */
 
-@import 'contrast/variables';
-@import 'application';
-@import 'contrast/diff';
-@import 'mastodon-bird-ui/layout-single-column.scss';
-@import 'mastodon-bird-ui/layout-multiple-columns.scss';
-
-body.theme-mastodon-bird-ui-accessible-plus {
+body.theme-mastodon-bird-ui-accessible {
   --color-accent: #0a9ff9;
   --color-accent-dark: #1a3ff9;
   --color-brand-mastodon-text-light: #fff;
@@ -52,7 +46,7 @@ body.theme-mastodon-bird-ui-accessible-plus {
 }
 
 /* Define font sizes for those where missing */
-body.theme-mastodon-bird-ui-accessible-plus {
+body.theme-mastodon-bird-ui-accessible {
   .edit-indicator__content .emojione, .reply-indicator__content .emojione, .status__content .emojione {
     height: 32px;
     width: 32px;
@@ -130,7 +124,7 @@ body .content-warning {
 }
 
 @media (max-width: 700px) {
-  body.theme-mastodon-bird-ui-accessible-plus {
+  body.theme-mastodon-bird-ui-accessible {
     --font-size: 24px;
     --line-height: 30px;
   }