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

Revert to native scrolling.

parent 27c8e852
Pipeline #1893 passed with stage
in 2 minutes and 21 seconds
...@@ -11,7 +11,6 @@ import Chip from 'material-ui/Chip'; ...@@ -11,7 +11,6 @@ import Chip from 'material-ui/Chip';
import WeekHours from './WeekHours'; import WeekHours from './WeekHours';
import { toggleSidebar } from '../actions/ui'; import { toggleSidebar } from '../actions/ui';
import FacilityTags from './FacilityTags'; import FacilityTags from './FacilityTags';
import { Scrollbars } from 'react-custom-scrollbars';
const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, facilities}) => { const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, facilities}) => {
...@@ -49,7 +48,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f ...@@ -49,7 +48,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f
</div> </div>
</div> </div>
<Divider className={'sidebar-divider'}/> <Divider className={'sidebar-divider'}/>
<Scrollbars className={'sidebar-scroll'}> <div className={'sidebar-scroll'}>
<div className={'sidebar-label-holder'}> <div className={'sidebar-label-holder'}>
<TextwTitle label="Building" content="The Johnson Center"/> <TextwTitle label="Building" content="The Johnson Center"/>
<TextwTitle label="Address" content="https://amenufromaplace.com"/> <TextwTitle label="Address" content="https://amenufromaplace.com"/>
...@@ -57,7 +56,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f ...@@ -57,7 +56,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f
<TextwTitle label="Tags" content={<FacilityTags facility={facility} />}/> <TextwTitle label="Tags" content={<FacilityTags facility={facility} />}/>
<TextwTitle label="Hours" content={<WeekHours facility={facility} />}/> <TextwTitle label="Hours" content={<WeekHours facility={facility} />}/>
</div> </div>
</Scrollbars> </div>
<div className={'sidebar-row2'}> <div className={'sidebar-row2'}>
<FacilitiesMap isMapOpen={isSidebarMapOpen} facilities={facilities} facility={facility}/> <FacilitiesMap isMapOpen={isSidebarMapOpen} facilities={facilities} facility={facility}/>
......
...@@ -5,11 +5,8 @@ import AppBar from '../components/AppBar'; ...@@ -5,11 +5,8 @@ import AppBar from '../components/AppBar';
import Sidebar from '../components/Sidebar'; import Sidebar from '../components/Sidebar';
import {getFacilities, setFacilities,sortByFavorites} from '../actions/api'; import {getFacilities, setFacilities,sortByFavorites} from '../actions/api';
import CardContainer from '../components/CardContainer'; import CardContainer from '../components/CardContainer';
import SearchBar from './SearchBar';
import KeyboardArrowLeft from 'material-ui-icons/KeyboardArrowLeft'; import KeyboardArrowLeft from 'material-ui-icons/KeyboardArrowLeft';
import KeyboardArrowRight from 'material-ui-icons/KeyboardArrowRight'; import KeyboardArrowRight from 'material-ui-icons/KeyboardArrowRight';
import { Scrollbars } from 'react-custom-scrollbars';
class Layout extends React.Component { class Layout extends React.Component {
constructor(props) { constructor(props) {
...@@ -47,10 +44,10 @@ class Layout extends React.Component { ...@@ -47,10 +44,10 @@ class Layout extends React.Component {
}}/> }}/>
<div className={'layout-container'}> <div className={'layout-container'}>
<div className={'layout-main-content'}> <div className={'layout-main-content'}>
<Scrollbars className={'layout-card-container'}> <div className={'layout-card-container'}>
<CardContainer styles={'layout-card-container'} searchTerm={searchTerm} campusRegion={campusRegion} <CardContainer styles={'layout-card-container'} searchTerm={searchTerm} campusRegion={campusRegion}
facilities={facilities} /> facilities={facilities} />
</Scrollbars> </div>
</div> </div>
<Sidebar facilities={facilities} facility={selectedFacility} isSidebarOpen={isSidebarOpen} <Sidebar facilities={facilities} facility={selectedFacility} isSidebarOpen={isSidebarOpen}
......
...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
width: 100%; width: 100%;
} }
.sidebar-scroll{ .sidebar-scroll{
height:calc(100% - 220px - 116px - 32px) !important; height:calc(100% - 220px - 116px - 32px) !important;
overflow-y: auto; overflow-y: auto;
} }
@media screen and (max-width: map-get($breakpoints, lg) - 1px) { @media screen and (max-width: map-get($breakpoints, lg) - 1px) {
......
...@@ -57,10 +57,6 @@ ...@@ -57,10 +57,6 @@
overflow-x: hidden; overflow-x: hidden;
} }
// .layout-card-container::-webkit-scrollbar {
// display: none;
// }
@media screen and (max-width: map-get($breakpoints, lg) - 1px) { @media screen and (max-width: map-get($breakpoints, lg) - 1px) {
.layout-sidebar-toggle-container { .layout-sidebar-toggle-container {
display: none; 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