Skip to content

Commit

Permalink
Upgrade Mastodon Bird UI to 2.0.0rc + add star theme versions
Browse files Browse the repository at this point in the history
  • Loading branch information
ronilaukkarinen committed Oct 29, 2023
1 parent 4ba9a88 commit 079d028
Show file tree
Hide file tree
Showing 10 changed files with 1,640 additions and 1,029 deletions.
9 changes: 9 additions & 0 deletions app/javascript/styles/hide-finnish-change-to-stars.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import 'application';
@import 'mastodon-bird-ui/layout-single-column.scss';
@import 'mastodon-bird-ui/layout-multiple-columns.scss';
@import 'mastodon-bird-ui/stars.scss';

/* Hide translate Finnish link */
.status__content__text[lang="fi"].translate ~ .status__content__translate-button {
display: none;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import 'application';
@import 'mastodon-bird-ui/layout-single-column.scss';
@import 'mastodon-bird-ui/layout-multiple-columns.scss';
@import 'mastodon-bird-ui/stars.scss';
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import 'mastodon-light/variables';
@import 'application';
@import 'mastodon-light/diff';
@import 'mastodon-bird-ui/layout-single-column.scss';
@import 'mastodon-bird-ui/layout-multiple-columns.scss';
@import 'mastodon-bird-ui/stars.scss';
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@import 'mastodon-light/variables';
@import 'application';
@import 'mastodon-light/diff';
@import 'mastodon-bird-ui/layout-single-column.scss';
@import 'mastodon-bird-ui/layout-multiple-columns.scss';
@import 'mastodon-bird-ui/stars.scss';

/* Hide translate Finnish link */
.status__content__text[lang="fi"].translate ~ .status__content__translate-button {
display: none;
}
1,069 changes: 503 additions & 566 deletions app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.scss

Large diffs are not rendered by default.

904 changes: 441 additions & 463 deletions app/javascript/styles/mastodon-bird-ui/layout-single-column.scss

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions app/javascript/styles/mastodon-bird-ui/stars.scss

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1746,13 +1746,17 @@ en:
themes:
contrast: Mastodon (High contrast)
default: Mastodon Bird UI (Dark)
default-change-to-stars: Mastodon Bird UI (Dark, Stars)
mastodon-bird-ui-light: Mastodon Bird UI (Light)
mastodon-bird-ui-light-change-to-stars: Mastodon Bird UI (Light, Stars)
mastodon-bird-ui-light-hide-finnish: Mastodon Bird UI (Light, hide Translate link for Finnish)
mastodon-bird-ui-light-hide-finnish-change-to-stars: Mastodon Bird UI (Light, Stars, hide Translate link for Finnish)
mastodon-bird-ui-light-hide-translate-links: Mastodon Bird UI (Light, hide all Translate links)
mastodon-bird-ui-contrast: Mastodon Bird UI (High contrast)
mastodon-light: Mastodon (Light)
mastodon-dark: Mastodon (Dark)
hide-finnish: Mastodon Bird UI (Dark, hide translate Finnish link)
hide-finnish-change-to-stars: Mastodon Bird UI (Dark, Stars, hide translate Finnish link)
hide-translate-links: Mastodon Bird UI (Dark, hide all Translate links)
mastodon-bird-ui-accessible: Mastodon Bird UI (Ultra accessible)
mastodon-bird-ui-accessible-hide-finnish: Mastodon Bird Ui (Ultra accessible, hide translate link for Finnish)
Expand Down
4 changes: 4 additions & 0 deletions config/locales/fi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1745,13 +1745,17 @@ fi:
themes:
contrast: Mastodon (Korkea kontrasti)
default: Mastodon Bird UI (Tumma)
default-change-to-stars: Mastodon Bird UI (Tumma, Tähdet)
mastodon-bird-ui-light: Mastodon Bird UI (Vaalea)
mastodon-bird-ui-light-change-to-stars: Mastodon Bird UI (Vaalea, Tähdet)
mastodon-bird-ui-light-hide-finnish: Mastodon Bird UI (Vaalea, piilota Käännä-linkit suomen kielelle)
mastodon-bird-ui-light-hide-finnish-change-to-stars: Mastodon Bird UI (Vaalea, Tähdet, piilota Käännä-linkit suomen kielelle)
mastodon-bird-ui-light-hide-translate-links: Mastodon Bird UI (Vaalea, piilota kaikki käännöslinkit)
mastodon-bird-ui-contrast: Mastodon Bird UI (Korkea kontrasti)
mastodon-light: Mastodon (Vaalea)
mastodon-dark: Mastodon (Tumma)
hide-finnish: Mastodon Bird UI (Tumma, piilota Käännä-linkit suomen kielelle)
hide-finnish-change-to-stars: Mastodon Bird UI (Tumma, Tähdet, piilota Käännä-linkit suomen kielelle)
hide-translate-links: Mastodon Bird UI (Tumma, piilota kaikki käännöslinkit)
mastodon-bird-ui-accessible: Mastodon Bird UI (Saavutettavuus huomioitu)
mastodon-bird-ui-accessible-hide-finnish: Mastodon Bird Ui (Saavutettavuus huomioitu, piilota Käännä-linkit suomelle)
Expand Down
3 changes: 3 additions & 0 deletions config/themes.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
default: styles/mastodon-bird-ui-dark.scss
default-change-to-stars: styles/mastodon-bird-ui-dark-change-to-stars.scss
hide-finnish: styles/hide-finnish.scss
hide-finnish-change-to-stars: styles/hide-finnish-change-to-stars.scss
hide-translate-links: styles/hide-translate-links.scss
mastodon-bird-ui-light: styles/mastodon-bird-ui-light.scss
mastodon-bird-ui-light-hide-finnish: styles/mastodon-bird-ui-light-hide-finnish.scss
mastodon-bird-ui-light-hide-finnish-change-to-stars: styles/mastodon-bird-ui-light-hide-finnish-change-to-stars.scss
mastodon-bird-ui-light-hide-translate-links: styles/mastodon-bird-ui-light-hide-translate-links.scss
mastodon-bird-ui-contrast: styles/mastodon-bird-ui-contrast.scss
mastodon-dark: styles/application.scss
Expand Down

0 comments on commit 079d028

Please sign in to comment.