mastodon/app/javascript/styles
Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/admin/base_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
  Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `config/navigation.rb`:
  Minor conflict caused by glitch-soc having additional
  navigation items for the theming system while upstream
  slightly changed every line.
2022-07-05 09:33:44 +02:00
..
contrast Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
mastodon-light Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
application.scss Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
contrast.scss
mailer.scss Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +02:00
mastodon-light.scss
win95.scss Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00