From 34208cbe674c3db317770638cee035484c6aa183 Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Tue, 7 Feb 2017 16:44:14 +0000 Subject: [PATCH] more positoning of elements --- frontend/src/components/header/index.js | 1 + ui/src/components/horizontal-list/li.js | 15 +++++++-------- ui/src/components/horizontal-list/ul.js | 6 ++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/header/index.js b/frontend/src/components/header/index.js index bb2f9036..b90b46fd 100644 --- a/frontend/src/components/header/index.js +++ b/frontend/src/components/header/index.js @@ -78,6 +78,7 @@ const StyledName = styled.span` height: ${remcalc(66)}; position: relative; top: ${remcalc(-12)}; + margin-right: ${remcalc(6)} `; const EmptyButton = styled.button` diff --git a/ui/src/components/horizontal-list/li.js b/ui/src/components/horizontal-list/li.js index 553df423..b7cd1e3b 100644 --- a/ui/src/components/horizontal-list/li.js +++ b/ui/src/components/horizontal-list/li.js @@ -16,21 +16,20 @@ const { module.exports = styled.li` display: inline-block; - padding-bottom: ${remcalc(10)}; & + & { margin-left: ${remcalc(24)}; } & a { - color: ${colors.base.primary}; + color: ${colors.base.secondaryDark}; text-decoration: none; - } - - & a.active { - cursor: default; - color: ${colors.base.primary}; - border-bottom: 2px solid ${colors.base.primary}; padding-bottom: ${remcalc(6)}; + + &.active { + cursor: default; + color: ${colors.base.primary}; + border-bottom: 2px solid ${colors.base.primary}; + } } `; diff --git a/ui/src/components/horizontal-list/ul.js b/ui/src/components/horizontal-list/ul.js index a6e8a3b4..5e90c926 100644 --- a/ui/src/components/horizontal-list/ul.js +++ b/ui/src/components/horizontal-list/ul.js @@ -1,4 +1,9 @@ const Styled = require('styled-components'); +const fns = require('../../shared/functions'); + +const { + remcalc +} = fns; const { default: styled @@ -6,4 +11,5 @@ const { module.exports = styled.ul` list-style-type: none; + margin-bottom: ${remcalc(33)}; `;