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 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		4 years ago
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
about.scss	Remove duplicate CSS properties (#16278)	4 years ago
accessibility.scss	Improve rendering of emoji which do not contrast with background (#13772)	5 years ago
accounts.scss	Fix lock icon not being shown when locking account in profile settings (#14190)	5 years ago
admin.scss	Fix various CodeClimate warnings	4 years ago
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	5 years ago
boost.scss	Fix styling of boost button in media modal not reflecting ability to boost (#16387)	4 years ago
compact_header.scss	…
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	Add assets from Twemoji 13.1.0 (#16345)	4 years ago
footer.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
forms.scss	Add authentication history (#16408)	4 years ago
introduction.scss	Fix performance of home feed regeneration (#12084)	5 years ago
lists.scss	…
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	Fix deprecated slash as division in SASS files (#16347)	4 years ago