Merge branch 'asonix/use-upstream-assets' of asonix/mastodon into asonix/changes

app/javascript/styles/contrast-wider.scss

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

app/javascript/styles/dog-wider.scss

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

app/javascript/styles/dog.scss

@@ -25,4 +25,4 @@ $ui-primary-color: #c9c7c5;      // Echo Blue
 $ui-secondary-color: #ebe9e8;    // Pattens Blue
 $ui-highlight-color: #48b9c7;    // Summer Sky
 
-@import 'custom';
+@import 'application';

app/javascript/styles/mastodon-light-wider.scss

@@ -0,0 +1,2 @@
+@import 'wide';
+@import 'mastodon-light';

app/javascript/styles/mastodon-wider.scss

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

app/javascript/styles/wide.scss

@@ -1,5 +1,4 @@
-@import 'application';
-
 .column {
   flex-grow: 1 !important;
+  max-width: 540px;
 }

config/locales/dog.yml

@@ -810,9 +810,13 @@ dog:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    dog: Dog
+    dog-wider: Dog (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/en.yml

@@ -810,9 +810,13 @@ en:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    dog: Dog
+    dog-wider: Dog (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/lion.yml

@@ -809,9 +809,13 @@ lion:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    dog: Dog
+    dog-wider: Dog (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/squeak.yml

@@ -810,9 +810,13 @@ squeak:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    dog: Dog
+    dog-wider: Dog (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/settings.yml

@@ -7,7 +7,7 @@
 # For more information, see docs/Running-Mastodon/Administration-guide.md
 #
 defaults: &defaults
-  site_title: asonix.dog
+  site_title: Mastodon
   site_description: ''
   site_extended_description: ''
   site_terms: ''
@@ -30,7 +30,7 @@ defaults: &defaults
   reduce_motion: false
   system_font_ui: false
   noindex: false
-  theme: 'default'
+  theme: 'mastodon'
   notification_emails:
     follow: false
     reblog: false

config/themes.yml

@@ -1,4 +1,8 @@
 contrast: styles/contrast.scss
-default: styles/dog.scss
-mastodon: styles/custom.scss
+contrast-wider: styles/contrast-wider.scss
+dog-wider: styles/dog-wider.scss
+dog: styles/dog.scss
+mastodon: styles/application.scss
+mastodon-wider: styles/mastodon-wider.scss
 mastodon-light: styles/mastodon-light.scss
+mastodon-light-wider: styles/mastodon-light-wider.scss