Skip to content

Commit

Permalink
Add Merriweather Sans to headings, closes barryclark#45.
Browse files Browse the repository at this point in the history
  • Loading branch information
johno committed Aug 28, 2014
1 parent 47d6cff commit 20d9af0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<link rel="stylesheet" href="{{ "/css/pixyll.css" | prepend: site.baseurl }}" type="text/css">
<link rel="stylesheet" href="{{ "/css/solarized-dark.css" | prepend: site.baseurl }}" type="text/css">

<!-- Merriweather Font -->
<!-- Fonts -->
<link href='http://fonts.googleapis.com/css?family=Merriweather:900,900italic,300,300italic' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Merriweather+Sans:800' rel='stylesheet' type='text/css'>
</head>
11 changes: 9 additions & 2 deletions css/pixyll.css
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ body {
.meta,
.post-meta {
width: auto;
font-size: 1rem;
font-weight: 300;
padding: 0.5rem;
color: #7a7a7a;
Expand Down Expand Up @@ -211,14 +212,16 @@ blockquote footer {
h1,
h2,
h3 {
font-family: 'Helvetica Neue', Helvetica, sans-serif;
font-family: "Merriweather Sans", 'Helvetica Neue', Helvetica, sans-serif;
font-weight: 800;
margin-top: 3rem;
}

h4,
h5,
h6 {
font-family: 'Helvetica Neue', Helvetica, sans-serif;
font-family: "Merriweather Sans", 'Helvetica Neue', Helvetica, sans-serif;
font-weight: 800;
margin-top: 1rem;
}

Expand Down Expand Up @@ -264,6 +267,10 @@ h6 {
.small {
font-size: 1rem;
}

.post-meta {
font-size: 1.5rem;
}
}

@media screen and (min-width: 64em) {
Expand Down

0 comments on commit 20d9af0

Please sign in to comment.