diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-21 10:03:55 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-21 10:03:55 +0100 |
commit | e616ffc5d60acafb67dadf90e396226d408d0cda (patch) | |
tree | 1be2e4094a5b29663f599f379c1bf9d2808acb51 /app/assets/javascripts/components/features/ui/index.jsx | |
parent | 29b12f9e0abb5031b368f2815d6408705e0498c6 (diff) |
Fix responsive layout breakpoint, replace mentions column with notifications
Diffstat (limited to 'app/assets/javascripts/components/features/ui/index.jsx')
-rw-r--r-- | app/assets/javascripts/components/features/ui/index.jsx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/app/assets/javascripts/components/features/ui/index.jsx b/app/assets/javascripts/components/features/ui/index.jsx index 655b1e2ee..9b5469bbd 100644 --- a/app/assets/javascripts/components/features/ui/index.jsx +++ b/app/assets/javascripts/components/features/ui/index.jsx @@ -1,13 +1,14 @@ -import ColumnsArea from './components/columns_area'; +import ColumnsArea from './components/columns_area'; import NotificationsContainer from './containers/notifications_container'; -import PureRenderMixin from 'react-addons-pure-render-mixin'; -import LoadingBarContainer from './containers/loading_bar_container'; -import HomeTimeline from '../home_timeline'; -import MentionsTimeline from '../mentions_timeline'; -import Compose from '../compose'; -import MediaQuery from 'react-responsive'; -import TabsBar from './components/tabs_bar'; -import ModalContainer from './containers/modal_container'; +import PureRenderMixin from 'react-addons-pure-render-mixin'; +import LoadingBarContainer from './containers/loading_bar_container'; +import HomeTimeline from '../home_timeline'; +import MentionsTimeline from '../mentions_timeline'; +import Compose from '../compose'; +import MediaQuery from 'react-responsive'; +import TabsBar from './components/tabs_bar'; +import ModalContainer from './containers/modal_container'; +import Notifications from '../notifications'; const UI = React.createClass({ @@ -26,11 +27,11 @@ const UI = React.createClass({ {this.props.children} </MediaQuery> - <MediaQuery minWidth={layoutBreakpoint}> + <MediaQuery minWidth={layoutBreakpoint + 1}> <ColumnsArea> <Compose /> <HomeTimeline trackScroll={false} /> - <MentionsTimeline trackScroll={false} /> + <Notifications trackScroll={false} /> {this.props.children} </ColumnsArea> </MediaQuery> |