diff --git a/web/app.react.js b/web/app.react.js --- a/web/app.react.js +++ b/web/app.react.js @@ -50,7 +50,7 @@ import history from './router-history.js'; import AccountSettings from './settings/account-settings.react.js'; import DangerZone from './settings/danger-zone.react.js'; -import LeftLayoutAside from './sidebar/left-layout-aside.react.js'; +import CommunityPicker from './sidebar/community-picker.react.js'; import SettingsSwitcher from './sidebar/settings-switcher.react.js'; import Splash from './splash/splash.react.js'; import './typography.css'; @@ -227,7 +227,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); - display: flex; - width: 400px; -} - .navigationPanelContainer { width: 160px; margin-top: 12px; 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.js'; -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 @@ -117,6 +117,10 @@ right: 0; padding: 15px 16px; } +.sidebar { + display: flex; + grid-area: sBar; +} span.loading-indicator-loading { display: inline-block; }