1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-05 02:09:05 +09:00
YuruToot/app/javascript/styles
Eugen Rochko bf3cb42da7 Add server banner to web app, add GET /api/v2/instance to REST API (#19294)
Cherry-picked d2528b26b6

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream changed stuff, we had extra attributes.
  Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
  Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
  so updated that file by keeping our extra attributes, and took upstream's
  version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
  Took upstream's version.
2022-10-09 19:51:39 +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 Add server banner to web app, add GET /api/v2/instance to REST API (#19294) 2022-10-09 19:51:39 +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 Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
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 More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00