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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
about.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
accessibility.scss	…
accounts.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	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	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
containers.scss	Fix counter sizing (#12446)	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	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
forms.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
introduction.scss	Fix performance of home feed regeneration (#12084)	5 years ago
lists.scss	…
modal.scss	…
polls.scss	Highlight border when focusing poll-form footer (#12544)	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	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago