From 8ac21f29176659a7eff7d00c5b1eba3bbd9b456f Mon Sep 17 00:00:00 2001 From: Xetera Date: Fri, 26 Jul 2019 15:53:24 -0700 Subject: [PATCH] basic style placeholders --- src/components/Layout/layout.scss | 578 +----------------------------- src/components/Navbar/index.tsx | 58 ++- src/components/Navbar/styles.tsx | 13 +- src/components/SEO/index.tsx | 1 - 4 files changed, 37 insertions(+), 613 deletions(-) diff --git a/src/components/Layout/layout.scss b/src/components/Layout/layout.scss index 4d24709..66c8b56 100644 --- a/src/components/Layout/layout.scss +++ b/src/components/Layout/layout.scss @@ -1,10 +1,11 @@ -// @import "~prismjs/themes/prism-tomorrow.css"; +// TODO: refactor this into styled components html { - font-family: sans-serif; + font-family: 'Lato'; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; } + body { margin: 0; -webkit-font-smoothing: antialiased; @@ -36,575 +37,4 @@ body { padding: 0; padding-left: 2.8em; overflow: initial; -} -// article, -// aside, -// details, -// figcaption, -// figure, -// footer, -// header, -// main, -// menu, -// nav, -// section, -// summary { -// display: block; -// } -// audio, -// canvas, -// progress, -// video { -// display: inline-block; -// } -// audio:not([controls]) { -// display: none; -// height: 0; -// } -// progress { -// vertical-align: baseline; -// } -// [hidden], -// template { -// display: none; -// } -// a { -// background-color: transparent; -// -webkit-text-decoration-skip: objects; -// } -// a:active, -// a:hover { -// outline-width: 0; -// } -// abbr[title] { -// border-bottom: none; -// text-decoration: underline; -// text-decoration: underline dotted; -// } -// b, -// strong { -// font-weight: inherit; -// font-weight: bolder; -// } -// dfn { -// font-style: italic; -// } -// h1 { -// font-size: 2em; -// margin: 0.67em 0; -// } -// mark { -// background-color: #ff0; -// color: #000; -// } -// small { -// font-size: 80%; -// } -// sub, -// sup { -// font-size: 75%; -// line-height: 0; -// position: relative; -// vertical-align: baseline; -// } -// sub { -// bottom: -0.25em; -// } -// sup { -// top: -0.5em; -// } -// img { -// border-style: none; -// } -// svg:not(:root) { -// overflow: hidden; -// } -// code, -// kbd, -// samp { -// font-family: monospace, monospace; -// font-size: 1em; -// } -// figure { -// margin: 1em 40px; -// } -// hr { -// box-sizing: content-box; -// height: 0; -// overflow: visible; -// } -// button, -// input, -// optgroup, -// select, -// textarea { -// font: inherit; -// margin: 0; -// } -// optgroup { -// font-weight: 700; -// } -// button, -// input { -// overflow: visible; -// } -// button, -// select { -// text-transform: none; -// } -// [type="reset"], -// [type="submit"], -// button, -// html [type="button"] { -// -webkit-appearance: button; -// } -// [type="button"]::-moz-focus-inner, -// [type="reset"]::-moz-focus-inner, -// [type="submit"]::-moz-focus-inner, -// button::-moz-focus-inner { -// border-style: none; -// padding: 0; -// } -// [type="button"]:-moz-focusring, -// [type="reset"]:-moz-focusring, -// [type="submit"]:-moz-focusring, -// button:-moz-focusring { -// outline: 1px dotted ButtonText; -// } -// fieldset { -// border: 1px solid silver; -// margin: 0 2px; -// padding: 0.35em 0.625em 0.75em; -// } -// legend { -// box-sizing: border-box; -// color: inherit; -// display: table; -// max-width: 100%; -// padding: 0; -// white-space: normal; -// } -// textarea { -// overflow: auto; -// } -// [type="checkbox"], -// [type="radio"] { -// box-sizing: border-box; -// padding: 0; -// } -// [type="number"]::-webkit-inner-spin-button, -// [type="number"]::-webkit-outer-spin-button { -// height: auto; -// } -// [type="search"] { -// -webkit-appearance: textfield; -// outline-offset: -2px; -// } -// [type="search"]::-webkit-search-cancel-button, -// [type="search"]::-webkit-search-decoration { -// -webkit-appearance: none; -// } -// ::-webkit-input-placeholder { -// color: inherit; -// opacity: 0.54; -// } -// ::-webkit-file-upload-button { -// -webkit-appearance: button; -// font: inherit; -// } -// html { -// font: 112.5%/1.45em georgia, serif; -// box-sizing: border-box; -// overflow-y: scroll; -// } -// * { -// box-sizing: inherit; -// } -// *:before { -// box-sizing: inherit; -// } -// *:after { -// box-sizing: inherit; -// } -// body { -// color: hsla(0, 0%, 0%, 0.8); -// font-family: georgia, serif; -// font-weight: normal; -// word-wrap: break-word; -// font-kerning: normal; -// -moz-font-feature-settings: "kern", "liga", "clig", "calt"; -// -ms-font-feature-settings: "kern", "liga", "clig", "calt"; -// -webkit-font-feature-settings: "kern", "liga", "clig", "calt"; -// font-feature-settings: "kern", "liga", "clig", "calt"; -// } -// img { -// max-width: 100%; -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -h1 { - margin-left: 0; - margin-right: 0; - margin-top: 0; - padding-bottom: 0; - padding-left: 0; - padding-right: 0; - padding-top: 0; - margin-bottom: 1.45rem; - color: inherit; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; - font-weight: bold; - text-rendering: optimizeLegibility; - font-size: 2.25rem; - line-height: 1.1; -} -h2 { - margin-left: 0; - margin-right: 0; - margin-top: 0; - padding-bottom: 0; - padding-left: 0; - padding-right: 0; - padding-top: 0; - margin-bottom: 1.45rem; - color: inherit; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; - font-weight: bold; - text-rendering: optimizeLegibility; - font-size: 1.62671rem; - line-height: 1.1; -} -h3 { - margin-left: 0; - margin-right: 0; - margin-top: 0; - padding-bottom: 0; - padding-left: 0; - padding-right: 0; - padding-top: 0; - margin-bottom: 1.45rem; - color: inherit; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; - font-weight: bold; - text-rendering: optimizeLegibility; - font-size: 1.38316rem; - line-height: 1.1; -} -h4 { - margin-left: 0; - margin-right: 0; - margin-top: 0; - padding-bottom: 0; - padding-left: 0; - padding-right: 0; - padding-top: 0; - margin-bottom: 1.45rem; - color: inherit; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; - font-weight: bold; - text-rendering: optimizeLegibility; - font-size: 1rem; - line-height: 1.1; -} -h5 { - margin-left: 0; - margin-right: 0; - margin-top: 0; - padding-bottom: 0; - padding-left: 0; - padding-right: 0; - padding-top: 0; - margin-bottom: 1.45rem; - color: inherit; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; - font-weight: bold; - text-rendering: optimizeLegibility; - font-size: 0.85028rem; - line-height: 1.1; -} -h6 { - margin-left: 0; - margin-right: 0; - margin-top: 0; - padding-bottom: 0; - padding-left: 0; - padding-right: 0; - padding-top: 0; - margin-bottom: 1.45rem; - color: inherit; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; - font-weight: bold; - text-rendering: optimizeLegibility; - font-size: 0.78405rem; - line-height: 1.1; -} -// hgroup { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// ul { -// margin-left: 1.45rem; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// list-style-position: outside; -// list-style-image: none; -// } -// ol { -// margin-left: 1.45rem; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// list-style-position: outside; -// list-style-image: none; -// } -// dl { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// dd { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// p { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// figure { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// table { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// font-size: 1rem; -// line-height: 1.45rem; -// border-collapse: collapse; -// width: 100%; -// } -// fieldset { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// blockquote { -// margin-left: 1.45rem; -// margin-right: 1.45rem; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// form { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// noscript { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// iframe { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// hr { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: calc(1.45rem - 1px); -// background: hsla(0, 0%, 0%, 0.2); -// border: none; -// height: 1px; -// } -// address { -// margin-left: 0; -// margin-right: 0; -// margin-top: 0; -// padding-bottom: 0; -// padding-left: 0; -// padding-right: 0; -// padding-top: 0; -// margin-bottom: 1.45rem; -// } -// b { -// font-weight: bold; -// } -// strong { -// font-weight: bold; -// } -// dt { -// font-weight: bold; -// } -// th { -// font-weight: bold; -// } -// li { -// margin-bottom: calc(1.45rem / 2); -// } -// ol li { -// padding-left: 0; -// } -// ul li { -// padding-left: 0; -// } -// li > ol { -// margin-left: 1.45rem; -// margin-bottom: calc(1.45rem / 2); -// margin-top: calc(1.45rem / 2); -// } -// li > ul { -// margin-left: 1.45rem; -// margin-bottom: calc(1.45rem / 2); -// margin-top: calc(1.45rem / 2); -// } -// blockquote *:last-child { -// margin-bottom: 0; -// } -// li *:last-child { -// margin-bottom: 0; -// } -// p *:last-child { -// margin-bottom: 0; -// } -// li > p { -// margin-bottom: calc(1.45rem / 2); -// } -// code { -// font-size: 0.85rem; -// line-height: 1.45rem; -// } -// kbd { -// font-size: 0.85rem; -// line-height: 1.45rem; -// } -// samp { -// font-size: 0.85rem; -// line-height: 1.45rem; -// } -// abbr { -// border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5); -// cursor: help; -// } -// acronym { -// border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5); -// cursor: help; -// } -// abbr[title] { -// border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5); -// cursor: help; -// text-decoration: none; -// } -// thead { -// text-align: left; -// } -// td, -// th { -// text-align: left; -// border-bottom: 1px solid hsla(0, 0%, 0%, 0.12); -// font-feature-settings: "tnum"; -// -moz-font-feature-settings: "tnum"; -// -ms-font-feature-settings: "tnum"; -// -webkit-font-feature-settings: "tnum"; -// padding-left: 0.96667rem; -// padding-right: 0.96667rem; -// padding-top: 0.725rem; -// padding-bottom: calc(0.725rem - 1px); -// } -// th:first-child, -// td:first-child { -// padding-left: 0; -// } -// th:last-child, -// td:last-child { -// padding-right: 0; -// } -// @media only screen and (max-width: 480px) { -// html { -// font-size: 100%; -// } -// } +} \ No newline at end of file diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index dd66f99..dadf420 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -1,44 +1,30 @@ import { Link } from "gatsby"; -import PropTypes from "prop-types"; import React from "react"; import icon from "./icon.png"; -import { HeaderWrapper } from "./styles"; +import { NavbarWrapper, NavbarItems } from "./styles"; -const Navbar = ({ siteTitle }) => ( - -
-
- {/* */} -

- - {siteTitle} - -

-
-
- -
+const Navbar = ({ siteTitle = "" }) => ( + + + {/* */} +

+ + {siteTitle} + +

+
+ + + + +
) -Navbar.propTypes = { - siteTitle: PropTypes.string, -} - -Navbar.defaultProps = { - siteTitle: ``, -} - export default Navbar; \ No newline at end of file diff --git a/src/components/Navbar/styles.tsx b/src/components/Navbar/styles.tsx index f8812d3..37dd501 100644 --- a/src/components/Navbar/styles.tsx +++ b/src/components/Navbar/styles.tsx @@ -1,6 +1,15 @@ import styled from "styled-components"; -export const HeaderWrapper = styled.header` +export const NavbarWrapper = styled.header` background: #ba1a2e; marginBottom: 1.45rem; -`; \ No newline at end of file + padding: 1.3rem; + display: flex; + justify-content: space-between; +`; + +export const NavbarItems = styled.div` + display: flex; + flex-direction: row; + align-items: center; +` \ No newline at end of file diff --git a/src/components/SEO/index.tsx b/src/components/SEO/index.tsx index db13b29..1028b4d 100644 --- a/src/components/SEO/index.tsx +++ b/src/components/SEO/index.tsx @@ -1,5 +1,4 @@ import * as React from "react" -import PropTypes from "prop-types" import Helmet from "react-helmet" import { useStaticQuery, graphql } from "gatsby"