diff --git a/web/app.react.js b/web/app.react.js --- a/web/app.react.js +++ b/web/app.react.js @@ -49,7 +49,7 @@ import AccountSettings from './settings/account-settings.react'; import DangerZone from './settings/danger-zone.react'; import AppSwitcher from './sidebar/app-switcher.react'; -import LeftLayoutAside from './sidebar/left-layout-aside.react'; +import CommunityPicker from './sidebar/community-picker.react'; import SettingsSwitcher from './sidebar/settings-switcher.react'; import Splash from './splash/splash.react'; import './typography.css'; @@ -245,7 +245,9 @@
{mainContent}
- +
+ +
); } diff --git a/web/sidebar/left-layout-aside.css b/web/sidebar/left-layout-aside.css --- a/web/sidebar/left-layout-aside.css +++ b/web/sidebar/left-layout-aside.css @@ -1,10 +1,3 @@ -.container { - grid-area: sBar; - background: var(--bg); - border-right: 1px solid var(--border-color); - display: flex; -} - .navigationPanelContainer { flex-direction: row; display: flex; @@ -43,11 +36,6 @@ height: 58px; } -.container p { - display: flex; - align-content: center; -} - .chatIconWrapper { position: relative; } diff --git a/web/sidebar/left-layout-aside.react.js b/web/sidebar/left-layout-aside.react.js deleted file mode 100644 --- a/web/sidebar/left-layout-aside.react.js +++ /dev/null @@ -1,20 +0,0 @@ -// @flow - -import * as React from 'react'; - -import CommunityPicker from './community-picker.react'; -import css from './left-layout-aside.css'; - -function LeftLayoutAside(): React.Node { - return ( - - ); -} - -const MemoizedLeftLayoutAside: React.ComponentType<{}> = React.memo<{}>( - LeftLayoutAside, -); - -export default MemoizedLeftLayoutAside; diff --git a/web/style.css b/web/style.css --- a/web/style.css +++ b/web/style.css @@ -111,6 +111,13 @@ right: 0; padding: 15px 16px; } + +.sidebar { + border-right: 1px solid var(--border-color); + display: flex; + grid-area: sBar; +} + .topBar { border-bottom: 1px solid var(--border); height: 60px;