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 a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc		6 years ago
..
_mixins.scss	Fix hashtags select styling in default and high contrast themes (#10029)	6 years ago
about.scss	Reduce padding around logo on landing page (#10291)	6 years ago
accessibility.scss	…
accounts.scss	Add "why do you want to join" field to invite requests (#10524)	6 years ago
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
basics.scss	Change error graphic to hover-to-play (#10055)	6 years ago
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers.scss	squashed identity proof updates (#10375)	6 years ago
dashboard.scss	Redesign admin instances area (#9645)	6 years ago
emoji_picker.scss	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)	6 years ago
footer.scss	…
forms.scss	squashed identity proof updates (#10375)	6 years ago
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	Add muted style for polls in web UI (#10248)	6 years ago
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	6 years ago
rtl.scss	…
stream_entries.scss	Improve blocked view of profiles (#10491)	6 years ago
tables.scss	Fix relationship manager on narrow screens (#10293)	6 years ago
variables.scss	…
widgets.scss	Add "why do you want to join" field to invite requests (#10524)	6 years ago