diff --git a/src/components/atoms/Icons.js b/src/components/atoms/Icons.js index 20a2fd5..e1ec05a 100644 --- a/src/components/atoms/Icons.js +++ b/src/components/atoms/Icons.js @@ -1,12 +1,9 @@ import React from 'react' import './Icons.scss' -export const Facebook = props => ( - - - -) +export const Logo = props => + + export const GitHub = props => ( @@ -41,3 +38,10 @@ export const Blog = props => + +export const Email = props => + + + + + diff --git a/src/components/molecules/Header.js b/src/components/molecules/Header.js index bff8b7f..1cacd4a 100644 --- a/src/components/molecules/Header.js +++ b/src/components/molecules/Header.js @@ -2,6 +2,7 @@ import React from 'react' import Link from 'gatsby-link' import PropTypes from 'prop-types' import Social from './Social' +import { Logo } from '../atoms/Icons' import './Header.scss' const Header = ({ meta }) => { @@ -10,7 +11,7 @@ const Header = ({ meta }) => { return
- +

{meta.title}

{meta.tagline}

diff --git a/src/components/molecules/Header.scss b/src/components/molecules/Header.scss index 281889c..48d37d9 100644 --- a/src/components/molecules/Header.scss +++ b/src/components/molecules/Header.scss @@ -11,10 +11,13 @@ .header__logo { display: block; + width: 1.5rem; + height: 1.5rem; + fill: $brand-grey-light; margin-top: -3rem; - font-size: 3rem; - color: $brand-grey-light; - margin-bottom: $spacer / 2; + margin-bottom: $spacer; + margin-left: auto; + margin-right: auto; } .header__title, @@ -51,8 +54,7 @@ } .header__title, - .header__description, - .header__logo { + .header__description { color: $brand-grey-light; transition: color .2s ease-out; } @@ -67,11 +69,12 @@ .header__logo { display: inline-block; - margin: 0; - font-size: 2rem; + width: 1rem; + height: 1rem; margin-top: -2rem; margin-bottom: 0; - margin-right: $spacer / 4; + margin-right: $spacer / 3; + margin-left: 0; } .header__name { diff --git a/src/components/molecules/Social.js b/src/components/molecules/Social.js index aa2202e..1dbeda0 100644 --- a/src/components/molecules/Social.js +++ b/src/components/molecules/Social.js @@ -1,20 +1,23 @@ import React from 'react' import PropTypes from 'prop-types' import { OutboundLink } from 'gatsby-plugin-google-analytics' -import { Blog, Twitter, GitHub, Facebook } from '../atoms/Icons' +import { Email, Blog, Twitter, GitHub, Dribbble } from '../atoms/Icons' import './Social.scss' const SocialIcon = ({ title }) => { - if (title === 'Blog') { - return - } else if (title === 'Twitter') { - return - } else if (title === 'GitHub') { - return - } else if (title === 'Facebook') { - return - } else { - return + switch (title) { + case 'Email': + return + case 'Blog': + return + case 'Twitter': + return + case 'GitHub': + return + case 'Dribbble': + return + default: + return null } } diff --git a/src/components/molecules/Social.scss b/src/components/molecules/Social.scss index b3d8d43..055ea94 100644 --- a/src/components/molecules/Social.scss +++ b/src/components/molecules/Social.scss @@ -1,7 +1,7 @@ @import 'variables'; .social { - margin-top: $spacer; + margin-top: $spacer * $line-height; display: flex; justify-content: center; width: 100%; diff --git a/src/data/meta.json b/src/data/meta.json index 724fbbf..57bc670 100644 --- a/src/data/meta.json +++ b/src/data/meta.json @@ -3,12 +3,12 @@ "tagline": "Designer & Developer", "description": "Portfolio of web & ui designer/developer hybrid Matthias Kretschmann.", "url": "https://matthiaskretschmann.com", - "email": "m@kretschmann.io", "social": { + "Email": "mailto:m@kretschmann.io", "Blog": "https://kremalicious.com", "Twitter": "https://twitter.com/kremalicious", "GitHub": "https://github.com/kremalicious", - "Facebook": "https://facebook.com/matthiaskretschmann" + "Dribbble": "https://dribbble.com/kremalicious" }, "available": false, "googleanalytics": "UA-1441794-4" diff --git a/src/images/logo.svg b/src/images/logo.svg new file mode 100644 index 0000000..d218227 --- /dev/null +++ b/src/images/logo.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/layouts/index.js b/src/layouts/index.js index 8c5a587..28a875d 100644 --- a/src/layouts/index.js +++ b/src/layouts/index.js @@ -34,10 +34,11 @@ export const query = graphql` description url social { + Email Blog Twitter GitHub - Facebook + Dribbble } } }