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 e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		6 years ago
..
_mixins.scss	Restore vanilla components	7 years ago
about.scss	Separate high contrast theme (#7213)	6 years ago
accounts.scss	Add preference to hide following/followers lists (#7532)	6 years ago
admin.scss	Improvements to toots display in admin view (#7452)	6 years ago
basics.scss	Add color variables of texts for better accesibility (#7125)	6 years ago
boost.scss	Add color variables of texts for better accesibility (#7125)	6 years ago
compact_header.scss	Separate high contrast theme (#7213)	6 years ago
components.scss	Merge branch 'master' into glitch-soc/merge	6 years ago
containers.scss	Combine similar components into one on public UI (#7458)	6 years ago
emoji_picker.scss	Separate high contrast theme (#7213)	6 years ago
footer.scss	Add preference to hide following/followers lists (#7532)	6 years ago
forms.scss	Bot nameplates (#7391)	6 years ago
landing_strip.scss	Separate high contrast theme (#7213)	6 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
reset.scss	Fix webkit scrollbars (#7191)	6 years ago
rtl.scss	Fix #6757: Adjust RTL styles for landing page (#6768)	6 years ago
stream_entries.scss	Separate high contrast theme (#7213)	6 years ago
tables.scss	Improvements to toots display in admin view (#7452)	6 years ago
variables.scss	Separate high contrast theme (#7213)	6 years ago