Merge branch 'test' into posty2

This commit is contained in:
Nick Pegg 2018-01-19 19:50:07 -08:00
commit 0c44ab688e
2 changed files with 10 additions and 5 deletions

View file

@ -1,9 +1,17 @@
body {
background: #FCFCFC;
color: #35352F;
font-family: 'Quicksand', sans-serif;
}
p {
font-family: 'Roboto', sans-serif;
}
pre code {
font-family: 'Source Code Pro', monospace;
}
a {
color: #FF4F00;
}
@ -12,10 +20,6 @@ a:hover {
color: #FF4F00;
}
h1, h2, h3, h4, h5 {
font-family: 'Quicksand', sans-serif;
}
blockquote {
margin-left: 0;
border-left: 0.5rem solid #dfe2e5;

View file

@ -6,8 +6,9 @@
<title>{{ site.title }} - {% block page_title %}{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Quicksand" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Source+Code+Pro" rel="stylesheet" type="text/css" />>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github-gist.min.css">
<link rel="stylesheet" href="{{ "css/normalize.css" | media_url }}" />