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/features/list_editor/index.jsx | |
| 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/features/list_editor/index.jsx')
| -rw-r--r-- | app/javascript/mastodon/features/list_editor/index.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/list_editor/index.jsx b/app/javascript/mastodon/features/list_editor/index.jsx index 65cebbdc8..ed9d09132 100644 --- a/app/javascript/mastodon/features/list_editor/index.jsx +++ b/app/javascript/mastodon/features/list_editor/index.jsx @@ -60,7 +60,7 @@ class ListEditor extends ImmutablePureComponent { {accountIds.map(accountId => <Account key={accountId} accountId={accountId} added />)} </div> - {showSearch && <div role='button' tabIndex='-1' className='drawer__backdrop' onClick={onClear} />} + {showSearch && <div role='button' tabIndex={-1} className='drawer__backdrop' onClick={onClear} />} <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}> {({ x }) => ( |