diff options
| author | chr <chr@cybre.space> | 2021-03-01 22:07:29 -0800 |
|---|---|---|
| committer | chr <chr@cybre.space> | 2021-03-01 22:07:29 -0800 |
| commit | a00797766b84b728a076fff0aab1e24d04d899ed (patch) | |
| tree | 811ad349a4062bb3e0fa059dca0f142ed7138abc /config | |
| parent | 2854fcdbb2dffa0a6dc67562bde0a3655136b0b3 (diff) | |
| parent | 75334de32c4e8888f6d16a4e1b6f774b64c4a5b9 (diff) | |
Merge branch 'themes_merged' into cybrespace-3.3
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 7 | ||||
| -rw-r--r-- | config/themes.yml | 5 | ||||
| -rw-r--r-- | config/webpacker.yml | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8245397d7..527494598 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1331,9 +1331,12 @@ en: <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p> title: "%{instance} Terms of Service and Privacy Policy" themes: + default: Cybrespace contrast: Mastodon (High contrast) - default: Mastodon (Dark) - mastodon-light: Mastodon (Light) + mastodon: Mastodon (Dark) + mastodon-light: Mastodon (light) + light: Cybre Lite + win95: Windows 95 time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/themes.yml b/config/themes.yml index 9c21c9459..05e7943be 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -1,3 +1,6 @@ -default: styles/application.scss +default: styles/cybre.scss +mastodon: styles/application.scss contrast: styles/contrast.scss mastodon-light: styles/mastodon-light.scss +light: styles/cybre-light.scss +win95: styles/win95.scss diff --git a/config/webpacker.yml b/config/webpacker.yml index 4ad78a190..a9e3636f5 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -31,6 +31,7 @@ default: &default - .ttf - .woff - .woff2 + - .gif extensions: - .mjs |