Merge branch 'Themes' into BirdUI

Signed-off-by: Nathan Sparrow <[email protected]>
DismalShadowX · Apr 29, 2024 · 81bedbf · 81bedbf
2 parents 89d2e6a + 774f3e6
commit 81bedbf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/javascript/styles/mastodon-bird-ui.scss b/app/javascript/styles/mastodon-bird-ui.scss
@@ -0,0 +1,3 @@
+@import 'application';
+@import 'mastodon-bird-ui/layout-single-column.scss';
+@import 'mastodon-bird-ui/layout-multiple-columns.scss';
diff --git a/config/themes.yml b/config/themes.yml
@@ -1,7 +1,13 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
+tangerineui: styles/tangerineui.scss
+tangerineui-purple: styles/tangerineui-purple.scss
+tangerineui-cherry: styles/tangerineui-cherry.scss
+tangerineui-peach: styles/tangerineui-peach.scss
+tangerineui-lemon: styles/tangerineui-lemon.scss
 mastodon-bird-ui-dark: 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
 mastodon-bird-ui-accessible: styles/mastodon-bird-ui-accessible.scss
+