#17 - style fixes

daat-hamakom · Apr 6, 2017 · ce28d58 · ce28d58
1 parent 7f18d16
commit ce28d58
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/src/components/app.js b/src/components/app.js
@@ -110,6 +110,20 @@ class App extends React.Component {
         toggleDrawer={() => { dispatch(toggleDrawer()) }}
       />
 
+      <Sidepane
+        app={props.app}
+        projects={props.projects}
+        places={props.places}
+        organizations={props.organizations}
+        people={props.people}
+        sidepane={props.sidepane}
+        params={props.params}
+        closeSidepane={() => { dispatch(deselectEvent()) }}
+        selectEvent={(ev) => { dispatch(selectEvent(ev, 'sidepane')) }}
+        openEventsSidepane={() => { dispatch(selectEvent(events, 'sidepane')) }}
+        selectMedia={(t, m) => { dispatch(openLightbox(t, m)) }}
+      />
+
       <Timeline
         params={props.params}
         app={props.app}
@@ -133,20 +147,6 @@ class App extends React.Component {
         toggleDrawer={() => { dispatch(toggleDrawer()) }}
       />
 
-      <Sidepane
-        app={props.app}
-        projects={props.projects}
-        places={props.places}
-        organizations={props.organizations}
-        people={props.people}
-        sidepane={props.sidepane}
-        params={props.params}
-        closeSidepane={() => { dispatch(deselectEvent()) }}
-        selectEvent={(ev) => { dispatch(selectEvent(ev, 'sidepane')) }}
-        openEventsSidepane={() => { dispatch(selectEvent(events, 'sidepane')) }}
-        selectMedia={(t, m) => { dispatch(openLightbox(t, m)) }}
-      />
-
       <Lightbox
         lightbox={props.lightbox}
         closeLightbox={() => { dispatch(closeLightbox()) }}

diff --git a/src/styles/app.scss b/src/styles/app.scss
@@ -54,6 +54,9 @@ body {
         // border-width: 2px 0 0 2px;
         &.vshrink {
             bottom: 366px;
+            + div#sidepane {
+                bottom: 366px;
+            }
         }
         &.hshrink {
             right: 327px;
@@ -717,9 +720,7 @@ body {
             position: absolute;
             top: 0;
             bottom: 0;
-        }
-        div#map-container.vshrink ~ div#sidepane {
-            bottom: 366px;
+            overflow-y: scroll;
         }
     }