From 9454841a697e1e2aa8b7474865c33200df705d77 Mon Sep 17 00:00:00 2001 From: Alex Huddleston Date: Wed, 24 Oct 2018 00:19:17 +0000 Subject: [PATCH 1/4] Changes to themes. --- app/javascript/styles/werefox-wide.scss | 2 ++ app/javascript/styles/werefox.scss | 28 +++++++++++++++++++++++++ app/javascript/styles/wide.scss | 4 ++++ config/initializers/source.rb | 9 ++++++++ config/locales/en.yml | 4 +++- config/themes.yml | 4 +++- config/webpacker.yml | 2 +- 7 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 app/javascript/styles/werefox-wide.scss create mode 100644 app/javascript/styles/werefox.scss create mode 100644 app/javascript/styles/wide.scss create mode 100644 config/initializers/source.rb diff --git a/app/javascript/styles/werefox-wide.scss b/app/javascript/styles/werefox-wide.scss new file mode 100644 index 000000000..d044a62fe --- /dev/null +++ b/app/javascript/styles/werefox-wide.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/app/javascript/styles/wide.scss b/app/javascript/styles/wide.scss new file mode 100644 index 000000000..9ea34d333 --- /dev/null +++ b/app/javascript/styles/wide.scss @@ -0,0 +1,4 @@ +.column { + flex-grow: 1 !important; + max-width: 540px; +} diff --git a/config/initializers/source.rb b/config/initializers/source.rb new file mode 100644 index 000000000..25c5129df --- /dev/null +++ b/config/initializers/source.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true +module Mastodon + module Version + module_function + def source_base_url + 'https://github.com//mastodon' + end + end +end diff --git a/config/locales/en.yml b/config/locales/en.yml index 501694eac..32a57f0f6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -866,8 +866,10 @@ en: title: "%{instance} Terms of Service and Privacy Policy" themes: contrast: High contrast - default: Mastodon + default: Werefox Software Theme but W I D E + mastodon: Mastodon mastodon-light: Mastodon (light) + werefox: Werefox Software Theme time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/themes.yml b/config/themes.yml index 9c21c9459..a057112bb 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -1,3 +1,5 @@ -default: styles/application.scss +default: styles/werefox-wide.scss contrast: styles/contrast.scss +mastodon: styles/application.scss mastodon-light: styles/mastodon-light.scss +werefox: styles/werefox.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 From fc856a5c4551eefc7fa06293026601af002631c7 Mon Sep 17 00:00:00 2001 From: Alex Huddleston Date: Wed, 24 Oct 2018 00:23:42 +0000 Subject: [PATCH 2/4] change to link to source code. --- config/initializers/source.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/source.rb b/config/initializers/source.rb index 25c5129df..f7efd4b93 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//mastodon' + 'https://gitea.werefoxsoftware.com/shadow8t4/Mastodon' end end end From ce161bc978f0a8aebc4f462763b893df7cd8e777 Mon Sep 17 00:00:00 2001 From: asonix Date: Tue, 23 Oct 2018 22:56:13 -0500 Subject: [PATCH 3/4] use 2.5.3 for shadow8t4 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 698976e3ca038ea9ad72a92fc1fac69e116ff6c7 Mon Sep 17 00:00:00 2001 From: asonix Date: Tue, 23 Oct 2018 23:05:27 -0500 Subject: [PATCH 4/4] Reset upstream settings --- config/initializers/source.rb | 2 +- config/settings.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/source.rb b/config/initializers/source.rb index f7efd4b93..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://gitea.werefoxsoftware.com/shadow8t4/Mastodon' + 'https://git.asonix.dog/asonix/mastodon' end end end diff --git a/config/settings.yml b/config/settings.yml index 136baa29c..3d10eba0f 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -31,7 +31,7 @@ defaults: &defaults reduce_motion: false system_font_ui: false noindex: false - theme: 'werefox-wider' + theme: 'mastodon' notification_emails: follow: false reblog: false