You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip c08c971dd3 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		7 years ago
..
_mixins.scss	Restore vanilla components	7 years ago
about.scss	Fix margin on top action button, fix width of counters on frontpage (#6573)	7 years ago
accounts.scss	Improve public account cards (#6559)	7 years ago
admin.scss	Fix overflowing audit logs (#6184)	7 years ago
basics.scss	Remove outline from body window (Fixes #6501) (#6502)	7 years ago
boost.scss	Restore vanilla components	7 years ago
compact_header.scss	Restore vanilla components	7 years ago
components.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
containers.scss	Redesign landing page (again) (#6486)	7 years ago
emoji_picker.scss	Fix emoji picker scrollbar (regression from #5046) (#5901)	7 years ago
footer.scss	Restore vanilla components	7 years ago
forms.scss	Fix margin on top action button, fix width of counters on frontpage (#6573)	7 years ago
landing_strip.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	7 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
reset.scss	Restore vanilla components	7 years ago
rtl.scss	Fix layout for RTL (#6014)	7 years ago
stream_entries.scss	Fix media spoiler design (#6507)	7 years ago
tables.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	7 years ago
variables.scss	ReFix font-weight of <strong> element for CJK fonts (#5920)	7 years ago