mastodon/app/javascript/styles/mastodon
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
..
_mixins.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
about.scss Do not hide hashtag timeline in mobile view, make it full-window (#8093) 2018-07-31 02:54:25 +02:00
accessibility.scss Add white outline to black emojis (fix #5083) (#7936) 2018-07-04 17:35:02 +02:00
accounts.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
admin.scss Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
basics.scss Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
boost.scss Add color variables of texts for better accesibility (#7125) 2018-04-18 16:52:15 +02:00
compact_header.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
components.scss Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
containers.scss Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
dashboard.scss Add admin dashboard (#8029) 2018-07-16 01:11:53 +02:00
emoji_picker.scss Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772) 2018-06-09 22:20:57 +02:00
footer.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
forms.scss Fix gradient, regression from #7927 (#7963) 2018-07-06 13:16:31 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
reset.scss Fix webkit scrollbars (#7191) 2018-04-19 23:35:47 +02:00
rtl.scss Fix gradient, regression from #7927 (#7963) 2018-07-06 13:16:31 +02:00
stream_entries.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
tables.scss Add vendor prefix for background-clip (#7727) 2018-06-04 13:24:20 +02:00
variables.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
widgets.scss Add missing formatting to the text in hero widget (#8089) 2018-07-28 23:52:20 +02:00