diff --git a/app/javascript/styles/contrast-wider.scss b/app/javascript/styles/contrast-wider.scss new file mode 100644 index 000000000..b20d638a2 --- /dev/null +++ b/app/javascript/styles/contrast-wider.scss @@ -0,0 +1,2 @@ +@import 'custom'; +@import 'contrast'; diff --git a/app/javascript/styles/dog-wider.scss b/app/javascript/styles/dog-wider.scss new file mode 100644 index 000000000..b37204892 --- /dev/null +++ b/app/javascript/styles/dog-wider.scss @@ -0,0 +1,2 @@ +@import 'custom'; +@import 'dog'; diff --git a/app/javascript/styles/dog.scss b/app/javascript/styles/dog.scss index c07d33051..86e6c5294 100644 --- a/app/javascript/styles/dog.scss +++ b/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'; diff --git a/app/javascript/styles/mastodon-light-wider.scss b/app/javascript/styles/mastodon-light-wider.scss new file mode 100644 index 000000000..efa2f2724 --- /dev/null +++ b/app/javascript/styles/mastodon-light-wider.scss @@ -0,0 +1,2 @@ +@import 'custom'; +@import 'mastodon-light'; diff --git a/app/javascript/styles/mastodon-wider.scss b/app/javascript/styles/mastodon-wider.scss new file mode 100644 index 000000000..cdd8c29e1 --- /dev/null +++ b/app/javascript/styles/mastodon-wider.scss @@ -0,0 +1,2 @@ +@import 'custom'; +@import 'application'; diff --git a/app/javascript/styles/custom.scss b/app/javascript/styles/wide.scss similarity index 61% rename from app/javascript/styles/custom.scss rename to app/javascript/styles/wide.scss index 7b9e92dce..f1b6d920a 100644 --- a/app/javascript/styles/custom.scss +++ b/app/javascript/styles/wide.scss @@ -1,5 +1,3 @@ -@import 'application'; - .column { flex-grow: 1 !important; } diff --git a/config/settings.yml b/config/settings.yml index 1b8c3b39b..0d485e7b0 100644 --- a/config/settings.yml +++ b/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: 'dog-wider' notification_emails: follow: false reblog: false diff --git a/config/themes.yml b/config/themes.yml index 2771c7344..9b19f5b78 100644 --- a/config/themes.yml +++ b/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 diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index 9665a92f1..7a99a1964 100644 Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index b22f0b2c2..b12aa55a3 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/favicon.ico b/public/favicon.ico index d4855f7a1..79000c9cc 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png index f916d5c45..a4994062d 100644 Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ