This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript/styles
Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
..
contrast Fix wrong colors in the high-contrast theme (#19708) 2022-11-04 02:28:14 +01:00
fonts Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
mastodon Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
mastodon-light Change "direct message" nomenclature to "private mention" in web UI (#24248) 2023-03-30 15:16:20 +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