Added link to the dashboard in the Header. Closes #49

This commit is contained in:
Andrey Okonetchnikov 2016-09-13 17:40:02 +02:00
parent a1aa51364b
commit 2eb920173a
3 changed files with 29 additions and 13 deletions

View File

@ -1,3 +1,25 @@
.header {
display: flex;
align-items: center;
background-color: #272e30;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.22);
height: 54px;
border-bottom: 2px solid #3ab7a5;
position: fixed;
width: 100%;
z-index: 999;
}
.homeLink {
display: inline-block;
padding: .5em;
color: #fff;
}
.findBar {
flex: 1;
}
.main { .main {
padding-top: 54px; padding-top: 54px;
} }

View File

@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { IndexLink } from 'react-router';
import { loadConfig } from '../actions/config'; import { loadConfig } from '../actions/config';
import { loginUser } from '../actions/auth'; import { loginUser } from '../actions/auth';
import { currentBackend } from '../backends/backend'; import { currentBackend } from '../backends/backend';
@ -105,15 +106,18 @@ class App extends React.Component {
return ( return (
<div> <div>
<header> <header className={styles.header}>
<div className={styles.alignable}> <IndexLink to="/" className={styles.homeLink}>
Dashboard
</IndexLink>
<div className={styles.findBar}>
<FindBar <FindBar
commands={commands} commands={commands}
defaultCommands={defaultCommands} defaultCommands={defaultCommands}
/> />
</div> </div>
</header> </header>
<div className={`${styles.alignable} ${styles.main}`}> <div className={styles.main}>
{children} {children}
</div> </div>
</div> </div>

View File

@ -17,16 +17,6 @@ body {
margin: 0; margin: 0;
} }
header {
background-color: #272e30;
box-shadow: 0 1px 2px 0 rgba(0,0,0,0.22);
height: 54px;
border-bottom:2px solid #3ab7a5;
position: fixed;
width: 100%;
z-index: 999;
}
:global #root, :global #root > * { :global #root, :global #root > * {
height: 100%; height: 100%;
} }