David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
_mixins.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
about.scss	Fix margin on top action button, fix width of counters on frontpage (#6573)	2018-03-01 02:48:08 +01:00
accounts.scss	Improve public account cards (#6559)	2018-02-26 16:18:41 +01:00
admin.scss	Fix overflowing audit logs (#6184)	2018-01-04 19:38:46 +01:00
basics.scss	Remove outline from body window (Fixes #6501) (#6502)	2018-02-18 16:32:58 +01:00
boost.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
compact_header.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
components.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
containers.scss	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00
emoji_picker.scss	Fix emoji picker scrollbar (regression from #5046) (#5901)	2017-12-06 12:18:27 +01:00
footer.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
forms.scss	Fix margin on top action button, fix width of counters on frontpage (#6573)	2018-03-01 02:48:08 +01:00
landing_strip.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
lists.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
modal.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-19 15:22:10 -06:00
reset.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
rtl.scss	Fix layout for RTL (#6014)	2017-12-13 18:28:13 +01:00
stream_entries.scss	Fix media spoiler design (#6507)	2018-02-19 02:39:18 +01:00
tables.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
variables.scss	ReFix font-weight of <strong> element for CJK fonts (#5920)	2017-12-07 21:35:19 +01:00