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 ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		5 years ago
..
_mixins.scss	Fix placeholder colors for inputs not being explicitly defined (#11890)	5 years ago
about.scss	Fix long domain block descriptions breaking table layout (#12029)	5 years ago
accessibility.scss	Add a few black emojis that are to have a white outline (#8597)	6 years ago
accounts.scss	Fix profile fields overflowing page width (#11828)	5 years ago
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
basics.scss	Add error description and button to copy stack trace to web UI (#12033)	5 years ago
boost.scss	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
compact_header.scss	Separate high contrast theme (#7213)	7 years ago
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
containers.scss	Fix media editing modal and profile directory in light theme (#12059)	5 years ago
dashboard.scss	Fix height of dashboard counters (#11736)	5 years ago
emoji_picker.scss	Fix sass-lint config (#10982)	6 years ago
footer.scss	Fix Mastodon logo style on hover on public pages' footer (#11735)	5 years ago
forms.scss	Fix placeholder colors for inputs not being explicitly defined (#11890)	5 years ago
introduction.scss	Fix performance of home feed regeneration (#12084)	5 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
polls.scss	Fix vote checkmark in poll results (#11990)	5 years ago
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	6 years ago
rtl.scss	Fix issues in RTL layout in web UI (#12060)	5 years ago
statuses.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
tables.scss	Fix batch actions being hidden from mobile view (#12183)	5 years ago
variables.scss	Add bookmarks (#7107)	5 years ago
widgets.scss	Add table of contents to about page (#11885)	5 years ago