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
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
..
contrast Fix text colors (#7227) 2018-04-22 14:29:40 +02:00
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
mastodon-light Fix autosuggest-textarea backgrounds and some minor adjustments (#7817) 2018-06-16 12:56:45 +02:00
application.scss
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss