catstodon/app/javascript/styles
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
2024-10-26 13:38:07 +02:00
..
contrast Update CSS color variables to match our latest design system (#31510) 2024-08-20 15:56:44 +00:00
fonts Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 2024-01-15 21:30:00 +01:00
mastodon Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
mastodon-light Change design of rich text elements in web UI (#32633) 2024-10-24 07:28:22 +00:00
application.scss Change embedded posts to use web UI (#31766) 2024-09-12 09:41:19 +00:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
inert.scss Use the assets pipeline to load inert.css (#28701) 2024-01-12 09:32:45 +00:00
mailer.scss Mailer layout fixes (#32132) 2024-09-27 19:41:41 +00:00
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss Fix deprecation warning in win95 theme 2024-07-10 17:46:33 +02:00