Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.		2020-09-01 17:02:18 +02:00
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	2020-01-27 13:44:29 +01:00
about.scss	Fix use of inline CSS in public pages (#13576)	2020-05-03 22:04:18 +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	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
boost.scss	Fix: also use custom private boost icon for detailed status (#14471)	2020-08-24 14:13:44 +02:00
compact_header.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
containers.scss	Fix counter sizing (#12446)	2019-11-29 17:03:38 +01:00
dashboard.scss	Fix height of dashboard counters (#11736)	2019-09-02 18:11:34 +02:00
emoji_picker.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
footer.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	2020-01-27 13:44:29 +01:00
forms.scss	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02: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	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02: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	Add a visibility icon to status (#14123)	2020-06-25 22:43:59 +02:00
statuses.scss	Fix avatar size in public page detailed status (#14140)	2020-06-25 22:41:12 +02:00
tables.scss	Fix batch actions being hidden from mobile view (#12183)	2019-10-24 22:46:59 +02:00
variables.scss	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
widgets.scss	Fix use of inline CSS in public pages (#13576)	2020-05-03 22:04:18 +02:00