Commit a70203a4 authored by EJ Finneran's avatar EJ Finneran
Browse files

Merge branch 'blendy' into 'master'

update some styles to make this a little bit more blendy with the app

See merge request cascade/rigado-node-hello-world-frontend!3
parents 704cccbe 0f3adeef
......@@ -19,6 +19,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link rel="stylesheet" href="https://use.typekit.net/fxq4xfr.css">
<title>Rigado</title>
</head>
<body>
......
......@@ -4,8 +4,9 @@ import styled from 'styled-components';
const Header = ({className, children}) => (
<header className={className}>
<img src="/images/RigadoLogo.png" alt="Rigado"/>
{children}
<h2>
Node Hello World
</h2>
</header>
);
......@@ -19,10 +20,11 @@ Header.propTypes = {
export default styled(Header)`
background-color: #fafafa;
width: 100%;
> img {
height: 26px;
margin: 12px 3px 0px 30px;
margin: 12px 3px 0px 30px;
h2 {
font-family: source-sans-pro, sans-serif;
font-weight: 100;
}
`
......@@ -6,7 +6,6 @@ const Overlay = styled.div`
position: absolute;
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.5);
z-index: 2;
cursor: not-allowed;
......
......@@ -39,7 +39,8 @@ Main.propTypes = {
export default styled(Main)`
height: 100%;
font-family: proxima-nova, sans-serif;
> .row > ${Header} {
height: 50px;
}
......
......@@ -12,6 +12,7 @@ injectGlobal`
font-family: sans-serif;
height: 100%;
width: 100%;
background-color: transparent !important;
}
#root {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment