Merge branch 'master' into class-properties-initializers

This commit is contained in:
Andrey Okonetchnikov
2016-10-03 16:41:15 +02:00
8 changed files with 58 additions and 45 deletions

View File

@ -20,7 +20,7 @@ import styles from './App.css';
class App extends React.Component {
state = {
navDrawerIsVisible: false
navDrawerIsVisible: true
};
componentDidMount() {
@ -137,10 +137,11 @@ class App extends React.Component {
<NavDrawer
active={navDrawerIsVisible}
scrollY
permanentAt="md"
permanentAt={navDrawerIsVisible ? 'lg' : null}
theme={styles}
>
<nav className={styles.nav}>
<h1>Collections</h1>
<h1 className={styles.heading}>Collections</h1>
<Navigation type='vertical'>
{
collections.valueSeq().map(collection =>
@ -164,7 +165,7 @@ class App extends React.Component {
onCreateEntryClick={createNewEntryInCollection}
toggleNavDrawer={this.toggleNavDrawer}
/>
<div className={`${styles.alignable} ${styles.main}`}>
<div className={styles.main}>
{children}
</div>
</Panel>