diff options
| author | chr <chr@cybre.space> | 2021-03-01 22:05:23 -0800 |
|---|---|---|
| committer | chr <chr@cybre.space> | 2021-03-01 22:05:23 -0800 |
| commit | 75334de32c4e8888f6d16a4e1b6f774b64c4a5b9 (patch) | |
| tree | e84fae95784c796d8ce38ec6ebab2a2454aa16ff /config | |
| parent | 814e1d6c1682bfe26326124f33fd68ba490cda7c (diff) | |
| parent | e76104bc5215fb6688f5665c34d5a7566be16b85 (diff) | |
Merge branch 'theme_win95' into themes_merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 5 | ||||
| -rw-r--r-- | config/themes.yml | 1 | ||||
| -rw-r--r-- | config/webpacker.yml | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 4d8e33d73..527494598 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1331,11 +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: - contrast: High contrast default: Cybrespace - mastodon: Mastodon + contrast: Mastodon (High contrast) + 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 acd46104f..05e7943be 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -3,3 +3,4 @@ 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 |