Merge pull request #118 from ReCodEx/fix-sidebar-scrolling

Fix sidebar scrolling
ReCodEx · Oct 27, 2017 · 3fdad53 · 3fdad53
2 parents 27f99e0 + 590b933
commit 3fdad53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/layout/Sidebar/Sidebar.js b/src/components/layout/Sidebar/Sidebar.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import classNames from 'classnames';
 
 // import Admin from '../Admin';
 import Public from './Public';
@@ -10,6 +11,8 @@ import Student from './Student';
 import Supervisor from './Supervisor';
 import BadgeContainer from '../../../containers/BadgeContainer';
 
+import styles from './sidebar.less';
+
 const Sidebar = ({
   isLoggedIn = false,
   studentOf,
@@ -19,7 +22,7 @@ const Sidebar = ({
   small = false,
   ...props
 }) => (
-  <aside className="main-sidebar">
+  <aside className={classNames(['main-sidebar', styles.mainSidebar])}>
     <section className="sidebar">
       {isLoggedIn && <BadgeContainer small={small} />}
       {isLoggedIn && <LoggedIn {...props} />}

diff --git a/src/components/layout/Sidebar/sidebar.less b/src/components/layout/Sidebar/sidebar.less
@@ -0,0 +1,4 @@
+.mainSidebar {
+  height: 100%;
+  overflow-y: scroll;
+}