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.

Claire f5a9971cac Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		4 years ago
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
about.scss	Add server rules (#15769)	4 years ago
accessibility.scss	Improve rendering of emoji which do not contrast with background (#13772)	4 years ago
accounts.scss	Fix lock icon not being shown when locking account in profile settings (#14190)	4 years ago
admin.scss	Fix various CodeClimate warnings	4 years ago
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	4 years ago
boost.scss	Change media modals look in web UI (#15217)	4 years ago
compact_header.scss	Separate high contrast theme (#7213)	7 years ago
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
containers.scss	Fix logo button style more (#15458)	4 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	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
forms.scss	Add system checks to dashboard in admin UI (#15989)	4 years ago
introduction.scss	Fix performance of home feed regeneration (#12084)	5 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Use custom mascot on static share page (#15687)	4 years ago
polls.scss	Fix end-user-facing uses of inline CSS (#13438)	5 years ago
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	6 years ago
rtl.scss	Fix logo button style (#15428)	4 years ago
statuses.scss	Fix logo button style more (#15458)	4 years ago
tables.scss	Fix batch actions being hidden from mobile view (#12183)	5 years ago
variables.scss	Add interrelationship icon (#15149)	4 years ago
widgets.scss	Add interrelationship icon (#15149)	4 years ago