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 a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		7 years ago
..
_mixins.scss	Restore vanilla components	7 years ago
about.scss	Fix padding bug in landing page column header (#6374)	7 years ago
accounts.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	7 years ago
admin.scss	Fix overflowing audit logs (#6184)	7 years ago
basics.scss	Restore vanilla components	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 'tootsuite/master' into merge-upstream	7 years ago
containers.scss	Restore vanilla components	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	CAS + SAML authentication feature (#6425)	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 font-weight of <strong> element for CJK fonts (#5914)	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