mastodon/app/javascript/styles
Baptiste Lemoine e50cb7160a 🐛 add icons in dropdown menu, fix style for this dropdown
Merge remote-tracking branch 'origin'

Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>

# Conflicts:
#	.ruby-version
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/features/direct_timeline/components/conversation.js
#	app/javascript/mastodon/features/getting_started/components/announcements.js
#	app/javascript/mastodon/locales/fr.json
#	config/locales/kab.yml
#	config/locales/ta.yml
#	yarn.lock
2020-04-09 17:33:58 +02:00
..
bliss 🐛 add icons in dropdown menu, fix style for this dropdown 2020-04-09 17:33:58 +02:00
contrast Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
custom fix mess footer 2020-02-01 17:29:30 +01:00
default fix mess footer 2020-02-01 17:29:30 +01:00
fonts Use correct local names for fonts (#10594) 2019-04-21 04:42:02 +02:00
mastodon 🐛 add icons in dropdown menu, fix style for this dropdown 2020-04-09 17:33:58 +02:00
mastodon-light 🐛 add icons in dropdown menu, fix style for this dropdown 2020-04-09 17:33:58 +02:00
application.scss Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
bliss.scss Merge branch 'master' of https://github.com/tootsuite/mastodon 2020-02-12 10:03:28 +01:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
custom.scss hop 2020-02-01 17:43:33 +01:00
large_center.scss hop 2020-02-01 17:43:33 +01:00
mailer.scss Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
mastodon-light.scss Merge branch 'master' of https://github.com/tootsuite/mastodon 2020-02-12 10:03:28 +01:00