diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:40:14 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:45:08 +0200 |
| commit | ce12934f5b1804cc144014d9d0a93fdd16d13bf1 (patch) | |
| tree | e6cb0c166392c28b38d86abe8f27344ce1d7752f /app/javascript/mastodon/containers | |
| parent | ff168ef2024626f37fa776fde5739dcd58ecb9f2 (diff) | |
| parent | 99e3e152cd2180cfa9a5bcafae208d44f31078f8 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
Diffstat (limited to 'app/javascript/mastodon/containers')
| -rw-r--r-- | app/javascript/mastodon/containers/media_container.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/containers/media_container.jsx b/app/javascript/mastodon/containers/media_container.jsx index 25dc17444..f9244f8dd 100644 --- a/app/javascript/mastodon/containers/media_container.jsx +++ b/app/javascript/mastodon/containers/media_container.jsx @@ -54,7 +54,7 @@ export default class MediaContainer extends PureComponent { handleCloseMedia = () => { document.body.classList.remove('with-modals--active'); - document.documentElement.style.marginRight = 0; + document.documentElement.style.marginRight = '0'; this.setState({ media: null, |