Skip to content
This repository has been archived by the owner on Mar 27, 2019. It is now read-only.

Fix scrolling #208

Merged
merged 6 commits into from
Oct 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions app/components/App/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -273,24 +273,26 @@ export default class App extends React.Component {
</Tabs>
</div>
);
return <div>
<Snackbar
className={styles.snackbar}
bodyStyle={this.state.snackbarStyle}
open={this.state.snackbarMessage != ''}
message={this.state.snackbarMessage}
autoHideDuration={3000}
onRequestClose={() => this.setState({ snackbarMessage: '' })}
onActionTouchTap={() => this.setState({ snackbarMessage: '' })}
/>
{this.state.logoutOpen && this.renderSessionExpDialog()}
<Header tokenIdentity={this.state.identity} />
<Menu pathname={this.props.location.pathname} />
<div id={styles.content}>
<Paper zDepth={1}>
{this.props.children || welcome}
</Paper>
return (
<div>
<Snackbar
className={styles.snackbar}
bodyStyle={this.state.snackbarStyle}
open={this.state.snackbarMessage != ''}
message={this.state.snackbarMessage}
autoHideDuration={3000}
onRequestClose={() => this.setState({ snackbarMessage: '' })}
onActionTouchTap={() => this.setState({ snackbarMessage: '' })}
/>
{this.state.logoutOpen && this.renderSessionExpDialog()}
<Header tokenIdentity={this.state.identity} />
<Menu pathname={this.props.location.pathname} />
<div id={styles.content}>
<Paper zDepth={1} style={{ 'border-right-style': 'inset' }}>
{this.props.children || welcome}
</Paper>
</div>
</div>
</div>
)
}
}
6 changes: 4 additions & 2 deletions app/components/App/app.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#content {
padding-left: 30px;
width: calc(100vw - 275px);
display: inline-block;
width: calc(100vw - 270px);
margin-left: 235px;
margin-top: 70px;
height: calc(100% - 70px);
overflow-y: scroll;
position: fixed;
}

.snackbar {
Expand Down