diff --git a/.ruby-version b/.ruby-version index 73462a5a1..aedc15bb0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.1 +2.5.3 diff --git a/app/javascript/styles/werefox-wider.scss b/app/javascript/styles/werefox-wider.scss new file mode 100644 index 000000000..d044a62fe --- /dev/null +++ b/app/javascript/styles/werefox-wider.scss @@ -0,0 +1,2 @@ +@import 'wide'; +@import 'werefox'; diff --git a/app/javascript/styles/werefox.scss b/app/javascript/styles/werefox.scss new file mode 100644 index 000000000..9aeca694d --- /dev/null +++ b/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'; diff --git a/config/initializers/source.rb b/config/initializers/source.rb index 8547386ea..3b77c80c9 100644 --- a/config/initializers/source.rb +++ b/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 diff --git a/config/locales/dog.yml b/config/locales/dog.yml index 2270fdaa8..a59595237 100644 --- a/config/locales/dog.yml +++ b/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" diff --git a/config/locales/en.yml b/config/locales/en.yml index dbb8cbefa..f2f6f9754 100644 --- a/config/locales/en.yml +++ b/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" diff --git a/config/locales/lion.yml b/config/locales/lion.yml index 099624dc0..e8f6b4038 100644 --- a/config/locales/lion.yml +++ b/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" diff --git a/config/locales/squeak.yml b/config/locales/squeak.yml index 3c5bc23a1..a78db4cd5 100644 --- a/config/locales/squeak.yml +++ b/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" diff --git a/config/themes.yml b/config/themes.yml index 53ff44bda..5a8594f74 100644 --- a/config/themes.yml +++ b/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 diff --git a/config/webpacker.yml b/config/webpacker.yml index 8d8470651..dc21dc510 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -47,4 +47,4 @@ production: compile: false # Cache manifest.json for performance - cache_manifest: true + cache_manifest: false