From 107f932e030a438a7dd74741bb8e55abc8ef0fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Mon, 5 Oct 2020 21:51:45 +0200 Subject: [PATCH] fix: minur ux tweaks --- .../feature/form/strategy-configure.jsx | 1 + .../__tests__/__snapshots__/drawer-test.jsx.snap | 16 +++++++++++++--- frontend/src/component/menu/drawer.jsx | 9 +++++---- frontend/src/component/menu/header.jsx | 6 +++--- frontend/src/component/styles.scss | 9 +++++++-- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/frontend/src/component/feature/form/strategy-configure.jsx b/frontend/src/component/feature/form/strategy-configure.jsx index ce3d3d1da5..d12ba10895 100644 --- a/frontend/src/component/feature/form/strategy-configure.jsx +++ b/frontend/src/component/feature/form/strategy-configure.jsx @@ -134,6 +134,7 @@ class StrategyConfigure extends React.Component { } return (
+
( - +export const DrawerMenu = ({ links = [], title = 'Unleash' }) => ( + - Unleash + {title}
@@ -54,7 +54,7 @@ export const DrawerMenu = ({ links = [] }) => ( key={item.path} to={item.path} className={[styles.navigationLink, 'mdl-color-text--grey-900'].join(' ')} - activeClassName={[styles.navigationLink, 'mdl-color-text--black', 'mdl-color--blue-grey-100'].join( + activeClassName={[styles.navigationLink, 'mdl-color-text--black', 'mdl-color--blue-grey-50'].join( ' ' )} > @@ -69,4 +69,5 @@ export const DrawerMenu = ({ links = [] }) => ( DrawerMenu.propTypes = { links: PropTypes.array, + title: PropTypes.string, }; diff --git a/frontend/src/component/menu/header.jsx b/frontend/src/component/menu/header.jsx index b61eee69a7..366bb498f6 100644 --- a/frontend/src/component/menu/header.jsx +++ b/frontend/src/component/menu/header.jsx @@ -35,16 +35,16 @@ class HeaderComponent extends PureComponent { } render() { - const { headerBackground, links } = this.props.uiConfig; + const { headerBackground, links, name } = this.props.uiConfig; const style = headerBackground ? { background: headerBackground } : {}; return ( -
} style={style}> +
} style={style}>
- + ); } diff --git a/frontend/src/component/styles.scss b/frontend/src/component/styles.scss index 95e6e390d0..71274a24b6 100644 --- a/frontend/src/component/styles.scss +++ b/frontend/src/component/styles.scss @@ -10,7 +10,7 @@ } .content { - width: 1200px; + width: 1100px; margin-left: auto; margin-right: auto; margin-top: 16px; @@ -25,6 +25,8 @@ @media (max-width: 1024px) { .content { width: 100%; + margin-left: 0; + margin-right: 0; } } @media (max-width: 600px) { @@ -46,6 +48,7 @@ padding-bottom: 16px; padding-left: 24px !important; } + @media screen and (max-width: 1024px) { .drawerTitle { padding-top: 12px; @@ -59,14 +62,16 @@ .drawerTitleText { display: inline-block; vertical-align: middle; + font-size: 0.8em; } .navigation { - padding: 8px 0 !important; + padding: 8px 5px 8px 0 !important; } .navigationLink { padding: 12px 20px !important; + border-radius: 0 50px 50px 0; } @media screen and (max-width: 1024px) { .navigationLink {