diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-23 01:35:22 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-22 01:20:15 -0600 |
| commit | 687fa7b9edd6a8b46eb6f12d7db8abde76e1eaf2 (patch) | |
| tree | 1425400adff34864d76984e7722eb88fa285c9bf /app/javascript/flavours/glitch/features/compose | |
| parent | e67f7b213055f996de7ab8c80ec19ee4a6dc3b51 (diff) | |
port glitch-soc@`610b4b4` to monsterfork: [Glitch] Add single-column mode
Port 9ddeb30f90f9402eb567c88354d4956fcfdf0361 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose')
| -rw-r--r-- | app/javascript/flavours/glitch/features/compose/index.js | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/index.js b/app/javascript/flavours/glitch/features/compose/index.js index 2e50738ed..7a0b66754 100644 --- a/app/javascript/flavours/glitch/features/compose/index.js +++ b/app/javascript/flavours/glitch/features/compose/index.js @@ -61,26 +61,12 @@ class Compose extends React.PureComponent { <div className='drawer__pager'> {!isSearchPage && <div className='drawer__inner'> <NavigationContainer /> + <ComposeFormContainer /> - {isStaff && multiColumn && ( - <div className='drawer__inner__admin'> - <h2>Staff Tools</h2> - <ul> - <li><a href="/admin/action_logs" target="_blank" rel="nofollow noopener">Audit log</a></li> - <li><a href="/admin/reports" target="_blank" rel="nofollow noopener">Reports</a></li> - <li><a href="/admin/pending_accounts" target="_blank" rel="nofollow noopener">Pending accounts</a></li> - <li><a href="/admin/domain_blocks/new" target="_blank" rel="nofollow noopener">Add domain policy...</a></li> - <li><a href="/admin/instances" target="_blank" rel="nofollow noopener">Federation</a></li> - <li><a href="/admin/accounts" target="_blank" rel="nofollow noopener">Accounts</a></li> - <li><a href="/admin/custom_emojis" target="_blank" rel="nofollow noopener">Custom emojis</a></li> - </ul> - </div> - )} - {multiColumn && ( - <div className='drawer__inner__mastodon'> - {mascot ? <img alt='' draggable='false' src={mascot} /> : <button className='mastodon' onClick={onClickElefriend} />} - </div> - )} + + <div className='drawer__inner__mastodon'> + {mascot ? <img alt='' draggable='false' src={mascot} /> : <button className='mastodon' onClick={onClickElefriend} />} + </div> </div>} <Motion defaultStyle={{ x: isSearchPage ? 0 : -100 }} style={{ x: spring(showSearch || isSearchPage ? 0 : -100, { stiffness: 210, damping: 20 }) }}> |