From af0081569155e03d103d3ebd5915145c180d699a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 16 Nov 2020 15:43:04 +0300
Subject: Merge css fixes from legacy app

---
 vnext/src/App.js | 130 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 67 insertions(+), 63 deletions(-)

(limited to 'vnext/src/App.js')

diff --git a/vnext/src/App.js b/vnext/src/App.js
index 91adf0b9..c3d4e5aa 100644
--- a/vnext/src/App.js
+++ b/vnext/src/App.js
@@ -149,70 +149,74 @@ export default function App() {
   return (
     <>
       <Header visitor={visitor} className={scrollState.hidden ? elClassHidden : ''} />
-      <section id="content" ref={contentRef} className={scrollState.top ? elClassTop : ''}>
-        <Switch>
-          <Route exact path="/">
-            <Discussions visitor={visitor} />
-          </Route>
-          <Route exact path="/home">
-            <Home visitor={visitor} />
-          </Route>
-          <Route exact path="/discover">
-            <Discover visitor={visitor} />
-          </Route>
-          <Route exact path="/settings">
-            <Settings visitor={visitor} onChange={auth} />
-          </Route>
-          <Route exact path="/login">
-            <Login visitor={visitor} onAuth={auth} />
-          </Route>
-          <Route exact path="/post">
-            <Post visitor={visitor} />
-          </Route>
-          <Route exact path="/pm">
-            <Contacts visitor={visitor} />
-          </Route>
-          <Route exact path="/pm/:user">
-            <Chat connection={eventSource} visitor={visitor} />
-          </Route>
-          <Route exact path="/:user/friends">
-            <Friends />
-          </Route>
-          <Route exact path="/:user/readers">
-            <Readers />
-          </Route>
-          <Route exact path="/:user">
-            <Blog visitor={visitor} />
-          </Route>
-          <Route exact path="/tag/:tag">
-            <Tag visitor={visitor} />
-          </Route>
-          <Route exact path="/:user/:mid">
-            <Thread connection={eventSource} visitor={visitor} />
-          </Route>
-        </Switch>
-      </section>
+      <div id="content_wrapper">
       {
-        visitor.uid > 0 &&
-        <aside id="sidebar">
-          <Link to="/?show=my">
-            <Icon name="ei-clock" size="s" />
-            <span className="desktop">My feed</span>
-          </Link>
-          <Link to="/pm">
-            <Icon name="ei-envelope" size="s" />
-            <span className="desktop">Messages</span>
-          </Link>
-          <Link to="/?show=discuss">
-            <Icon name="ei-bell" size="s" />
-            <span className="desktop">Discussions</span>
-          </Link>
-          <Link to="/settings" rel="nofollow">
-            <Icon name="ei-gear" size="s" />
-            <span className="desktop">Settings</span>
-          </Link>
-        </aside>
-      }
+          visitor.uid > 0 &&
+          <aside id="sidebar">
+            <div id="sidebar_wrapper">
+              <Link to="/?show=my">
+                <Icon name="ei-clock" size="s" />
+                <span className="desktop">My feed</span>
+              </Link>
+              <Link to="/pm">
+                <Icon name="ei-envelope" size="s" />
+                <span className="desktop">Messages</span>
+              </Link>
+              <Link to="/?show=discuss">
+                <Icon name="ei-bell" size="s" />
+                <span className="desktop">Discussions</span>
+              </Link>
+              <Link to="/settings" rel="nofollow">
+                <Icon name="ei-gear" size="s" />
+                <span className="desktop">Settings</span>
+              </Link>
+            </div>
+          </aside>
+        }
+        <section id="content" ref={contentRef} className={scrollState.top ? elClassTop : ''}>
+          <Switch>
+            <Route exact path="/">
+              <Discussions visitor={visitor} />
+            </Route>
+            <Route exact path="/home">
+              <Home visitor={visitor} />
+            </Route>
+            <Route exact path="/discover">
+              <Discover visitor={visitor} />
+            </Route>
+            <Route exact path="/settings">
+              <Settings visitor={visitor} onChange={auth} />
+            </Route>
+            <Route exact path="/login">
+              <Login visitor={visitor} onAuth={auth} />
+            </Route>
+            <Route exact path="/post">
+              <Post visitor={visitor} />
+            </Route>
+            <Route exact path="/pm">
+              <Contacts visitor={visitor} />
+            </Route>
+            <Route exact path="/pm/:user">
+              <Chat connection={eventSource} visitor={visitor} />
+            </Route>
+            <Route exact path="/:user/friends">
+              <Friends />
+            </Route>
+            <Route exact path="/:user/readers">
+              <Readers />
+            </Route>
+            <Route exact path="/:user">
+              <Blog visitor={visitor} />
+            </Route>
+            <Route exact path="/tag/:tag">
+              <Tag visitor={visitor} />
+            </Route>
+            <Route exact path="/:user/:mid">
+              <Thread connection={eventSource} visitor={visitor} />
+            </Route>
+          </Switch>
+        </section>
+      </div>
     </>
   );
 }
-- 
cgit v1.2.3