Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge BirdUI branch #31

Merged
merged 5 commits into from
Jul 29, 2024
Merged

Merge BirdUI branch #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95d98cf
Upload BirdUI
DismalShadowX Jul 29, 2024
20709fc
Update en.yml - BirdUI
DismalShadowX Jul 29, 2024
ec1fad0
Update themes.yml
DismalShadowX Jul 29, 2024
a1a0923
Added SCSS files for BirdUI
DismalShadowX Jul 29, 2024
abef363
Update themes.yml typo
DismalShadowX Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/javascript/styles/mastodon-bird-ui-contrast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import 'contrast/variables';
@import 'application';
@import 'contrast/diff';
@import 'mastodon-bird-ui/layout-single-column.scss';
@import 'mastodon-bird-ui/layout-multiple-columns.scss';
3 changes: 3 additions & 0 deletions app/javascript/styles/mastodon-bird-ui-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import 'application';
@import 'mastodon-bird-ui/layout-single-column.scss';
@import 'mastodon-bird-ui/layout-multiple-columns.scss';
5 changes: 5 additions & 0 deletions app/javascript/styles/mastodon-bird-ui-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@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';
5,118 changes: 5,118 additions & 0 deletions app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.scss
View file
Open in desktop

Large diffs are not rendered by default.

5,366 changes: 5,366 additions & 0 deletions app/javascript/styles/mastodon-bird-ui/layout-single-column.scss
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1793,6 +1793,9 @@ en:
contrast: Mastodon (High contrast)
default: Mastodon (Dark)
mastodon-light: Mastodon (Light)
mastodon-bird-ui: Mastodon Bird UI (Dark)
mastodon-bird-ui-light: Mastodon Bird UI (Light)
mastodon-bird-ui-contrast: Mastodon Bird UI (High contrast)
system: Automatic (use system theme)
time:
formats:
Expand Down
3 changes: 3 additions & 0 deletions config/themes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
default: styles/application.scss
contrast: styles/contrast.scss
mastodon-light: styles/mastodon-light.scss
mastodon-bird-ui: styles/mastodon-bird-ui-dark.scss
mastodon-bird-ui-contrast: styles/mastodon-bird-ui-contrast.scss
mastodon-bird-ui-light: styles/mastodon-bird-ui-light.scss
Loading