Claire 759226e116 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	2020-01-27 13:44:29 +01:00
about.scss	Remove duplicate CSS properties (#16278)	2021-05-19 23:51:52 +02:00
accessibility.scss	Improve rendering of emoji which do not contrast with background (#13772)	2020-06-09 10:28:23 +02:00
accounts.scss	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
admin.scss	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-19 18:51:41 +01:00
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
boost.scss	Fix styling of boost button in media modal not reflecting ability to boost (#16387)	2021-06-25 04:45:30 +02:00
compact_header.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
containers.scss	Fix logo button style more (#15458)	2020-12-30 23:18:39 +01:00
dashboard.scss	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
emoji_picker.scss	Fix background-color of emoji-mart selector (#17011)	2021-11-19 18:21:37 +01:00
footer.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	2020-01-27 13:44:29 +01:00
forms.scss	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
introduction.scss	Fix performance of home feed regeneration (#12084)	2019-10-06 22:11:17 +02:00
lists.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
modal.scss	Use custom mascot on static share page (#15687)	2021-02-11 02:18:56 +01:00
polls.scss	Fix end-user-facing uses of inline CSS (#13438)	2020-04-28 10:16:55 +02:00
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	2019-01-24 13:32:23 +01:00
rtl.scss	Improve hover and focus style in columns settings (#16222)	2021-10-01 00:55:51 +02:00
statuses.scss	Fix logo button style more (#15458)	2020-12-30 23:18:39 +01:00
tables.scss	Fix batch actions being hidden from mobile view (#12183)	2019-10-24 22:46:59 +02:00
variables.scss	Add interrelationship icon (#15149)	2020-11-12 17:43:12 +01:00
widgets.scss	Fix deprecated slash as division in SASS files (#16347)	2021-06-01 23:47:27 +02:00