glitch-soc/app/javascript/styles
Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
2023-10-25 12:14:24 +02:00
..
contrast Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
fonts Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream 2023-07-13 13:49:58 +02:00
mastodon Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 2023-10-25 12:14:24 +02:00
mastodon-light Fix light theme select option for hashtags (#26311) 2023-08-04 09:41:17 +02:00
application.scss Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss Update Stylelint (#25819) 2023-07-12 12:31:23 +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