Merge branch 'theme_win95' into themes_merged

2021-03-01 22:05:23 -08:00 · 2021-03-01 22:05:23 -08:00 · 75334de32c
parent 814e1d6c16 e76104bc52
commit 75334de32c
34 changed files with 2592 additions and 2 deletions
--- a/app/javascript/fonts/premillenium/MSSansSerif.ttf
+++ b/app/javascript/fonts/premillenium/MSSansSerif.ttf
--- a/app/javascript/images/alert_badge.png
+++ b/app/javascript/images/alert_badge.png
--- a/app/javascript/images/clippy_frame.png
+++ b/app/javascript/images/clippy_frame.png
--- a/app/javascript/images/clippy_wave.gif
+++ b/app/javascript/images/clippy_wave.gif
--- a/app/javascript/images/elephant-fren.png
+++ b/app/javascript/images/elephant-fren.png
--- a/app/javascript/images/icon_about.png
+++ b/app/javascript/images/icon_about.png
--- a/app/javascript/images/icon_blocks.png
+++ b/app/javascript/images/icon_blocks.png
--- a/app/javascript/images/icon_bookmarks.png
+++ b/app/javascript/images/icon_bookmarks.png
--- a/app/javascript/images/icon_developers.png
+++ b/app/javascript/images/icon_developers.png
--- a/app/javascript/images/icon_direct.png
+++ b/app/javascript/images/icon_direct.png
--- a/app/javascript/images/icon_docs.png
+++ b/app/javascript/images/icon_docs.png
--- a/app/javascript/images/icon_domain_blocks.png
+++ b/app/javascript/images/icon_domain_blocks.png
--- a/app/javascript/images/icon_follow_requests.png
+++ b/app/javascript/images/icon_follow_requests.png
--- a/app/javascript/images/icon_home.png
+++ b/app/javascript/images/icon_home.png
--- a/app/javascript/images/icon_invite.png
+++ b/app/javascript/images/icon_invite.png
--- a/app/javascript/images/icon_keyboard_shortcuts.png
+++ b/app/javascript/images/icon_keyboard_shortcuts.png
--- a/app/javascript/images/icon_likes.png
+++ b/app/javascript/images/icon_likes.png
--- a/app/javascript/images/icon_lists.png
+++ b/app/javascript/images/icon_lists.png
--- a/app/javascript/images/icon_local.png
+++ b/app/javascript/images/icon_local.png
--- a/app/javascript/images/icon_logout.png
+++ b/app/javascript/images/icon_logout.png
--- a/app/javascript/images/icon_mobile_apps.png
+++ b/app/javascript/images/icon_mobile_apps.png
--- a/app/javascript/images/icon_mutes.png
+++ b/app/javascript/images/icon_mutes.png
--- a/app/javascript/images/icon_notifications.png
+++ b/app/javascript/images/icon_notifications.png
--- a/app/javascript/images/icon_pin.png
+++ b/app/javascript/images/icon_pin.png
--- a/app/javascript/images/icon_profile_directory.png
+++ b/app/javascript/images/icon_profile_directory.png
--- a/app/javascript/images/icon_public.png
+++ b/app/javascript/images/icon_public.png
--- a/app/javascript/images/icon_security.png
+++ b/app/javascript/images/icon_security.png
--- a/app/javascript/images/icon_settings.png
+++ b/app/javascript/images/icon_settings.png
--- a/app/javascript/images/icon_tos.png
+++ b/app/javascript/images/icon_tos.png
--- a/app/javascript/images/start.png
+++ b/app/javascript/images/start.png
--- a/app/javascript/styles/win95.scss
+++ b/app/javascript/styles/win95.scss
--- 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"
--- 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
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@ -31,6 +31,7 @@ default: &default
    - .ttf
    - .woff
    - .woff2
    - .gif
  extensions:
    - .mjs