Commit 886e2c9a authored by Andrew Hrdy's avatar Andrew Hrdy

Revert to native scrolling.

parent 27c8e852
......@@ -11,7 +11,6 @@ import Chip from 'material-ui/Chip';
import WeekHours from './WeekHours';
import { toggleSidebar } from '../actions/ui';
import FacilityTags from './FacilityTags';
import { Scrollbars } from 'react-custom-scrollbars';
const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, facilities}) => {
......@@ -49,7 +48,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f
</div>
</div>
<Divider className={'sidebar-divider'}/>
<Scrollbars className={'sidebar-scroll'}>
<div className={'sidebar-scroll'}>
<div className={'sidebar-label-holder'}>
<TextwTitle label="Building" content="The Johnson Center"/>
<TextwTitle label="Address" content="https://amenufromaplace.com"/>
......@@ -57,7 +56,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f
<TextwTitle label="Tags" content={<FacilityTags facility={facility} />}/>
<TextwTitle label="Hours" content={<WeekHours facility={facility} />}/>
</div>
</Scrollbars>
</div>
<div className={'sidebar-row2'}>
<FacilitiesMap isMapOpen={isSidebarMapOpen} facilities={facilities} facility={facility}/>
......
......@@ -5,11 +5,8 @@ import AppBar from '../components/AppBar';
import Sidebar from '../components/Sidebar';
import {getFacilities, setFacilities,sortByFavorites} from '../actions/api';
import CardContainer from '../components/CardContainer';
import SearchBar from './SearchBar';
import KeyboardArrowLeft from 'material-ui-icons/KeyboardArrowLeft';
import KeyboardArrowRight from 'material-ui-icons/KeyboardArrowRight';
import { Scrollbars } from 'react-custom-scrollbars';
class Layout extends React.Component {
constructor(props) {
......@@ -47,10 +44,10 @@ class Layout extends React.Component {
}}/>
<div className={'layout-container'}>
<div className={'layout-main-content'}>
<Scrollbars className={'layout-card-container'}>
<div className={'layout-card-container'}>
<CardContainer styles={'layout-card-container'} searchTerm={searchTerm} campusRegion={campusRegion}
facilities={facilities} />
</Scrollbars>
</div>
</div>
<Sidebar facilities={facilities} facility={selectedFacility} isSidebarOpen={isSidebarOpen}
......
......@@ -57,10 +57,6 @@
overflow-x: hidden;
}
// .layout-card-container::-webkit-scrollbar {
// display: none;
// }
@media screen and (max-width: map-get($breakpoints, lg) - 1px) {
.layout-sidebar-toggle-container {
display: none;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment