From f7809882919c29caf885d158b49b757004487ef3 Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Thu, 19 Jan 2017 15:49:01 +0000 Subject: [PATCH] Fixing font colours and colours of list items --- frontend/src/components/header/index.js | 2 ++ ui/src/components/button/index.js | 8 -------- ui/src/components/list/header.js | 10 +++------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/header/index.js b/frontend/src/components/header/index.js index 110c7683..fe3c2001 100644 --- a/frontend/src/components/header/index.js +++ b/frontend/src/components/header/index.js @@ -66,6 +66,8 @@ const StyledTooltipWrapper = styled.div` `; const StyledName = styled.span` + color: #646464; + font-size: ${remcalc(16)} position: relative; top: ${remcalc(-12)}; `; diff --git a/ui/src/components/button/index.js b/ui/src/components/button/index.js index 1c3b0563..6831d02f 100644 --- a/ui/src/components/button/index.js +++ b/ui/src/components/button/index.js @@ -69,14 +69,6 @@ const style = css` padding: ${remcalc('14 16')}; position: relative; - font-family: -apple-system, - BlinkMacSystemFont, - "Segoe UI", - Roboto, - "Helvetica Neue", - Arial, - sans-serif; - font-size: ${remcalc(16)}; font-weight: 400; text-align: center; diff --git a/ui/src/components/list/header.js b/ui/src/components/list/header.js index c59a6f39..9408c02a 100644 --- a/ui/src/components/list/header.js +++ b/ui/src/components/list/header.js @@ -1,13 +1,8 @@ -const constants = require('../../shared/constants'); const fns = require('../../shared/functions'); const Item = require('./item'); const React = require('react'); const Styled = require('styled-components'); -const { - colors -} = constants; - const { remcalc } = fns; @@ -19,8 +14,9 @@ const { const StyledItem = styled(Item)` position: absolute; - background-color: ${colors.brandPrimary}; - border: solid ${remcalc(1)} ${colors.borderPrimary}; + background-color: #3B4AAF; + + border: solid ${remcalc(1)} #2D3884; box-shadow: none; width: calc(100% + ${remcalc(2)});