Merge branch 'master' of git.skehsucks.xyz:ida/isnotalive

rename mastodon-spooky to mastodon-autumn
2019-12-23 13:50:34 -07:00 · 2019-12-23 13:49:12 -07:00
4 changed files with 2 additions and 2 deletions
--- a/app/javascript/styles/mastodon-autumn.scss
+++ b/app/javascript/styles/mastodon-autumn.scss
--- a/app/javascript/styles/mastodon-autumn/variables.scss
+++ b/app/javascript/styles/mastodon-autumn/variables.scss
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1143,7 +1143,7 @@ en:
    contrast: Mastodon (High contrast)
    default: Mastodon (Dark)
    mastodon-light: Mastodon (Light)
-    mastodon-spooky: Mastodon (Spooky)
+    mastodon-autumn: Mastodon (Autumn)
    mastodon-winter: Mastodon (Winter)
    synthwave: Radtown (Synthwave)
    chillstep: Radtown (Chillstep) 
--- a/config/themes.yml
+++ b/config/themes.yml
@ -1,7 +1,7 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
-mastodon-spooky: styles/mastodon-spooky.scss
+mastodon-autumn: styles/mastodon-autumn.scss
 mastodon-winter: styles/mastodon-winter.scss
 synthwave: styles/synthwave.scss
 chillstep: styles/chillstep.scss
Author	SHA1	Message	Date
ida schmidt	ede68c47da	Merge branch 'master' of git.skehsucks.xyz:ida/isnotalive	2019-12-23 13:50:34 -07:00
ida schmidt	c24da4d43f	rename mastodon-spooky to mastodon-autumn	2019-12-23 13:49:12 -07:00