diff --git a/frontend/src/component/app.jsx b/frontend/src/component/app.jsx index adafeebb8b..85cedb0147 100644 --- a/frontend/src/component/app.jsx +++ b/frontend/src/component/app.jsx @@ -12,11 +12,6 @@ import UserContainer from './user/user-container'; import ShowUserContainer from './user/show-user-container'; import { ScrollContainer } from 'react-router-scroll'; -const base = { - name: 'Unleash', - link: '/', -}; - function replace (input, params) { if (!params) { return input; @@ -55,27 +50,27 @@ export default class App extends Component { } getSections () { - if (window.innerWidth < 768) { - return [base]; - } const { routes, params } = this.props; const unique = {}; - let result = [base].concat(routes.splice(1).map((routeEntry) => ({ - name: replace(routeEntry.pageTitle, params), - link: replace(routeEntry.link || routeEntry.path, params), - }))).filter(entry => { - if (!unique[entry.link]) { - unique[entry.link] = true; - return true; - } - return false; - }); + const result = routes.splice(1) + .map((routeEntry) => ({ + name: replace(routeEntry.pageTitle, params), + link: replace(routeEntry.link || routeEntry.path, params), + })) + .filter(entry => { + if (!unique[entry.link]) { + unique[entry.link] = true; + return true; + } + return false; + }); // mutate document.title: document.title = result .map(e => e.name) .reverse() - .join(' - '); + .concat('Unleash') + .join(' – '); return result; } @@ -85,9 +80,12 @@ export default class App extends Component { return ( {result.map((entry, index) => ( - - {entry.name} - {(index + 1) < result.length ? ' / ' : null} + 0 ? 'mdl-layout--large-screen-only' : ''}> + {index > 0 ? ' › ' : null} + + {entry.name} + + ))} ); @@ -125,7 +123,7 @@ export default class App extends Component { - Unleash + Unleash
{createListItem('/features', 'Feature toggles', 'list', true)} diff --git a/frontend/src/component/styles.scss b/frontend/src/component/styles.scss index fa60864996..e3e8c4c734 100644 --- a/frontend/src/component/styles.scss +++ b/frontend/src/component/styles.scss @@ -1,8 +1,12 @@ -.title { +.headerTitleLink { + text-decoration: none; +} + +.drawerTitle { padding-left: 24px !important; } @media screen and (max-width: 1024px) { - .title { + .drawerTitle { padding-left: 16px !important; } } diff --git a/frontend/src/index.jsx b/frontend/src/index.jsx index 78b81c642f..c102e72e41 100644 --- a/frontend/src/index.jsx +++ b/frontend/src/index.jsx @@ -48,8 +48,8 @@ ReactDOM.render( - - + + @@ -60,12 +60,12 @@ ReactDOM.render( - - + + - +