diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-19 19:09:04 +0100 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2018-12-20 18:39:05 +0100 |
commit | fb63941c471d2c1af3fb615c7ae11e39b4c2504d (patch) | |
tree | 446399274b0d212cb98fabd17c94aee75713deb2 /app/javascript/flavours/glitch/features | |
parent | 5eaf2c9e027f1f6ef4e783e726ab7fcbc769a881 (diff) |
Make drawer markup and styling closer to upstream
WARNING: This may break some custom skins! `.drawer > .contents` has been moved to `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved from `.drawer > .contents` to `.drawer__inner__mastodon`!
Diffstat (limited to 'app/javascript/flavours/glitch/features')
-rw-r--r-- | app/javascript/flavours/glitch/features/drawer/index.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/drawer/index.js b/app/javascript/flavours/glitch/features/drawer/index.js index 038a2513e..ffb18c5a0 100644 --- a/app/javascript/flavours/glitch/features/drawer/index.js +++ b/app/javascript/flavours/glitch/features/drawer/index.js @@ -121,10 +121,17 @@ class Drawer extends React.Component { submitted={submitted} value={searchValue} /> } - <div className='contents'> - {!isSearchPage && <DrawerAccount account={account} />} - {!isSearchPage && <Composer />} - {multiColumn && <button className='mastodon' onClick={onClickElefriend} />} + <div className='drawer__pager'> + {!isSearchPage && <div className='drawer__inner'> + <DrawerAccount account={account} /> + <Composer /> + {multiColumn && ( + <div className='drawer__inner__mastodon'> + <button className='mastodon' onClick={onClickElefriend} /> + </div> + )} + </div>} + {(multiColumn || isSearchPage) && <DrawerResults results={results} |