1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
YuruToot/app/javascript/styles
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
2024-10-06 16:07:58 +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 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
mastodon-light Fix sass deprecation warning (#31961) 2024-09-18 17:39:32 +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