diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-25 21:27:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-25 21:27:00 +0200 |
| commit | 1e5532e693d9533ee37f553aeb191e284178fa52 (patch) | |
| tree | d56b1cf2111722d744d675d750c6dfd514392752 /app/javascript/mastodon/features/ui/components/columns_area.js | |
| parent | 5cdb4c483f732235d3b0b07eeed34757b33b0f83 (diff) | |
Add responsive panels to the single-column layout (#10820)
* Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager
Diffstat (limited to 'app/javascript/mastodon/features/ui/components/columns_area.js')
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/columns_area.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js index ae07b8907..756db3c61 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.js +++ b/app/javascript/mastodon/features/ui/components/columns_area.js @@ -14,6 +14,8 @@ import DrawerLoading from './drawer_loading'; import BundleColumnError from './bundle_column_error'; import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, DirectTimeline, FavouritedStatuses, ListTimeline } from '../../ui/util/async-components'; import Icon from 'mastodon/components/icon'; +import ComposePanel from './compose_panel'; +import NavigationPanel from './navigation_panel'; import detectPassiveEvents from 'detect-passive-events'; import { scrollRight } from '../../../scroll'; @@ -173,14 +175,22 @@ class ColumnsArea extends ImmutablePureComponent { return ( <div className='columns-area__panels'> - <div className='columns-area__panels__pane' /> + <div className='columns-area__panels__pane columns-area__panels__pane--compositional'> + <div className='columns-area__panels__pane__inner'> + <ComposePanel /> + </div> + </div> <div className='columns-area__panels__main'> <TabsBar key='tabs' /> {content} </div> - <div className='columns-area__panels__pane' /> + <div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'> + <div className='columns-area__panels__pane__inner'> + <NavigationPanel /> + </div> + </div> {floatingActionButton} </div> |