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.

Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		6 years ago
..
_mixins.scss	Restore vanilla components	7 years ago
about.scss	Do not hide hashtag timeline in mobile view, make it full-window (#8093)	6 years ago
accessibility.scss	Add white outline to black emojis (fix #5083) (#7936)	6 years ago
accounts.scss	Redesign public profiles and toots (#8068)	6 years ago
admin.scss	Add federation relay support (#7998)	6 years ago
basics.scss	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
boost.scss	Add color variables of texts for better accesibility (#7125)	7 years ago
compact_header.scss	Separate high contrast theme (#7213)	7 years ago
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers.scss	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
dashboard.scss	Add admin dashboard (#8029)	6 years ago
emoji_picker.scss	Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)	7 years ago
footer.scss	Redesign public profiles and toots (#8068)	6 years ago
forms.scss	Fix gradient, regression from #7927 (#7963)	6 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
reset.scss	Fix webkit scrollbars (#7191)	7 years ago
rtl.scss	Fix gradient, regression from #7927 (#7963)	6 years ago
stream_entries.scss	Redesign public profiles and toots (#8068)	6 years ago
tables.scss	Add vendor prefix for background-clip (#7727)	7 years ago
variables.scss	Redesign public profiles and toots (#8068)	6 years ago
widgets.scss	Add missing formatting to the text in hero widget (#8089)	6 years ago