monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Claire 10a0d76bf0 Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different handling for
  the character limit.
  Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different limits for
  option length and number of options.
  Ported glitch-soc's changes to the new version.

Additional change:
- `app/javascript/styles/components.scss`:
  Change how the new image is looked up.
 		2024-02-22 20:58:41 +01:00
..
contrast Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
fonts Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 2024-01-15 21:30:00 +01:00
mastodon Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 2024-02-22 20:58:41 +01:00
mastodon-light Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
application.scss Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
contrast.scss
…
inert.scss Use the assets pipeline to load `inert.css` (#28701) 2024-01-12 09:32:45 +00:00
mailer.scss Fix banner image not showing in follow emails (#28814) 2024-01-19 09:23:59 +00:00
mastodon-light.scss
…
win95.scss Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00