luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 20:03:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
2023-07-12 15:27:32 +02:00
..
contrast Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
fonts Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
mastodon Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
mastodon-light Change button colors to increase hover/focus contrast and consistency (#25677) 2023-07-03 11:32:31 +02:00
application.scss Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
contrast.scss
mailer.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
mastodon-light.scss
win95.scss Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00