Tweaks to atlas menu icon

This commit is contained in:
Jori Lallo
2016-07-17 17:30:03 -07:00
parent 4d81bf0fa2
commit 4628ce073e
3 changed files with 38 additions and 24 deletions

View File

@@ -39,7 +39,7 @@ function requireAuth(nextState, replace) {
} }
render(( render((
<div style={{ display: 'flex', flex: 1, }}> <div style={{ display: 'flex', flex: 1, minHeight: '100%', }}>
<Provider { ...stores }> <Provider { ...stores }>
<Router history={History}> <Router history={History}>
<Route path="/" component={ Application }> <Route path="/" component={ Application }>

View File

@@ -139,7 +139,9 @@ class DocumentScene extends React.Component {
</CenteredContent> </CenteredContent>
) : ( ) : (
<Flex flex={ true }> <Flex flex={ true }>
{ this.store.isAtlas && sidebar && ( { this.store.isAtlas && (
<Flex>
{ sidebar && (
<div className={ styles.sidebar }> <div className={ styles.sidebar }>
<Tree <Tree
paddingLeft={ 10 } paddingLeft={ 10 }
@@ -151,12 +153,15 @@ class DocumentScene extends React.Component {
/> />
</div> </div>
) } ) }
<Flex flex={ true } justify={ 'center' } className={ styles.content}> <div className={ styles.sidebarToggle } onClick={ toggleSidebar }>
{ this.store.isAtlas && (<img <img
src={ require("assets/icons/menu.svg") } src={ require("assets/icons/menu.svg") }
className={ styles.menuIcon } className={ styles.menuIcon }
onClick={ toggleSidebar } />
/>) } </div>
</Flex>
) }
<Flex flex={ true } justify={ 'center' } className={ styles.content}>
<CenteredContent> <CenteredContent>
{ this.store.updatingContent ? ( { this.store.updatingContent ? (
<AtlasPreviewLoading /> <AtlasPreviewLoading />

View File

@@ -14,15 +14,24 @@
position: relative; position: relative;
} }
.menuIcon { .sidebarToggle {
position: absolute; display: flex;
top: 22px; position: relative;
left: 17px; width: 60px;
height: 28px;
opacity: 0.15;
cursor: pointer; cursor: pointer;
justify-content: center;
&:hover { &:hover {
background-color: #f5f5f5;
.menuIcon {
opacity: 1; opacity: 1;
} }
} }
}
.menuIcon {
margin-top: 18px;
height: 28px;
opacity: 0.15;
}