Many improvements: navbar, favico, new icons

This commit is contained in:
vjrj 2017-12-07 17:29:17 +01:00
parent 3dc8edb4a8
commit f1786541cd
20 changed files with 161 additions and 83 deletions

View file

@ -9,23 +9,29 @@ import { translate } from 'react-i18next';
import './Navigation.scss';
const Navigation = props => (
<Navbar bsClass="navbar navbar-dark bg-dark">
<nav className="navbar navbar-expand-lg navbar-dark bg-dark">
<div className="container">
{/* <Navbar bsClass="navbar navbar-dark bg-dark"> */}
{/* https://github.com/react-bootstrap/react-bootstrap/blob/master/src/Navbar.js */}
<Navbar.Header>
{window.location.pathname != '/'?
<Navbar.Brand>
<Link to="/">{props.t('AppNameFull')}</Link>
</Navbar.Brand>: ''
}
<Link to="/">{props.t('AppNameFull')}</Link>
</Navbar.Brand>
{/* <Navbar.Toggle/> */}
<button className="sr-only navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span className="navbar-toggler-icon"></span>
</button>
</Navbar.Header>
<Navbar.Collapse>
<button className="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span className="navbar-toggler-icon"></span>
</button>
{/* <Navbar.Collapse> */}
<div className="collapse navbar-collapse" id="navbarNavDropdown">
{!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation {...props} />}
</Navbar.Collapse>
</Navbar>
{/* </Navbar.Collapse> */}
</div>
</div>
</nav>
);
Navigation.defaultProps = {

View file

@ -26,3 +26,15 @@ a.nav-link:hover {
.navbar {
padding: 0.3rem 0rem;
}
a.navbar-brand {
font-size: 26px;
}
@media (max-width: 480px) {
a.navbar-brand {
font-size: 16px;
padding: 15px 3px;
}
}