Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
This commit is contained in:
Claire
2024-01-15 19:30:07 +01:00
parent 1323dfac80 c6684aa1e3
commit 60298af3c4
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/inert.css
View File

@@ -1,12 +0,0 @@
[inert] {
pointer-events: none;
cursor: default;
}
[inert],
[inert] * {
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
}