Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		2018-07-09 07:13:59 +02:00
..
_mixins.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
about.scss	Fix style of attachment list on /about (#7930)	2018-07-03 01:48:09 +02:00
accessibility.scss	Add white outline to black emojis (fix #5083) (#7936)	2018-07-04 17:35:02 +02:00
accounts.scss	Add follow button to detailed status, add gradient to mask bio cut-off (#7979)	2018-07-07 22:20:14 +02:00
admin.scss	Improvements to toots display in admin view (#7452)	2018-05-12 17:44:15 +02:00
basics.scss	Add color variables of texts for better accesibility (#7125)	2018-04-18 16:52:15 +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/tentative-merge	2018-07-09 07:13:59 +02:00
containers.scss	Combine similar components into one on public UI (#7458)	2018-05-12 15:30:06 +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	Add "Edit profile" link to public profile page, increase bottom padding (#7754)	2018-06-07 22:40:55 +02:00
forms.scss	Fix gradient, regression from #7927 (#7963)	2018-07-06 13:16:31 +02:00
landing_strip.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +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	Add follow button to detailed status, add gradient to mask bio cut-off (#7979)	2018-07-07 22:20:14 +02:00
tables.scss	Add vendor prefix for background-clip (#7727)	2018-06-04 13:24:20 +02:00
variables.scss	Fix color mistakes in mastodon-light theme (#7626)	2018-05-26 10:53:44 +02:00