Merge branch 'asonix/changes' into asonix/downstream

.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.3

app/javascript/styles/werefox-wider.scss

@@ -0,0 +1,2 @@
+@import 'wide';
+@import 'werefox';

app/javascript/styles/werefox.scss

@@ -0,0 +1,28 @@
+// Commonly used web colors
+$black: #3b3633;            // Black
+$white: #fafafa;            // White
+$success-green: #3e935b;    // Padua
+$error-red: #a3360a;        // Cerise
+$warning-red: #f9dfb6;      // Sunset Orange
+$gold-star: #faa41a;        // Dark Goldenrod
+
+$base-shadow-color: #999;
+$base-overlay-background: #3b3633;
+$base-border-color: #fafafa;
+$simple-background-color: #fafafa;
+$primary-text-color: #fafafa;
+$valid-value-color: #3e935b;
+$error-value-color: #a3360a;
+
+// Values from the classic Mastodon UI
+$classic-base-color: #2a2a2a;         // WS Black
+$classic-primary-color: #aaaaaa;      // WS Light Gray
+$classic-secondary-color: #9e9e9e;    // WS Gray
+$classic-highlight-color: #1c70ce;    // WS Blue
+
+$ui-base-color: #2a2a2a;         // WS Black
+$ui-primary-color: #aaaaaa;      // WS Light Gray
+$ui-secondary-color: #9e9e9e;    // WS Gray
+$ui-highlight-color: #1c70ce;    // WS Blue
+
+@import 'application';

config/initializers/source.rb

@@ -3,7 +3,7 @@ module Mastodon
   module Version
     module_function
     def source_base_url
-      'https://github.com/asonix/mastodon'
+      'https://git.asonix.dog/asonix/mastodon'
     end
   end
 end

config/locales/dog.yml

@@ -875,6 +875,8 @@ dog:
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
     mastodon-light-wider: Mastodon (light, wider)
+    werefox: Werefox Software Theme
+    werefox-wider: Werefox Software Theme but W I D E
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/en.yml

@@ -875,6 +875,8 @@ en:
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
     mastodon-light-wider: Mastodon (light, wider)
+    werefox: Werefox Software Theme
+    werefox-wider: Werefox Software Theme but W I D E
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/lion.yml

@@ -875,6 +875,8 @@ lion:
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
     mastodon-light-wider: Mastodon (light, wider)
+    werefox: Werefox Software Theme
+    werefox-wider: Werefox Software Theme but W I D E
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/squeak.yml

@@ -875,6 +875,8 @@ squeak:
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
     mastodon-light-wider: Mastodon (light, wider)
+    werefox: Werefox Software Theme
+    werefox-wider: Werefox Software Theme but W I D E
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/themes.yml

@@ -8,3 +8,5 @@ mastodon: styles/application.scss
 mastodon-wider: styles/mastodon-wider.scss
 mastodon-light: styles/mastodon-light.scss
 mastodon-light-wider: styles/mastodon-light-wider.scss
+werefox: styles/werefox.scss
+werefox-wider: styles/werefox-wider.scss

config/webpacker.yml

@@ -47,4 +47,4 @@ production:
   compile: false
 
   # Cache manifest.json for performance
-  cache_manifest: true
+  cache_manifest: false