Skip to content

Commit

Permalink
Switch to Merriweather fonts as a default
Browse files Browse the repository at this point in the history
  • Loading branch information
charvolant committed Jan 26, 2019
1 parent 8cc77e5 commit 88d3876
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion common/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<?php fire_plugin_hook('public_head',array('view'=>$this)); ?>
<!-- Stylesheets -->
<?php
queue_css_url('//fonts.googleapis.com/css?family=Balthazar:700,400|Raleway:700,400|Merriweather:400,700');
queue_css_url('//fonts.googleapis.com/css?family=Merriweather+Sans:700,400|Merriweather:400,700');
queue_css_file(array('iconfonts', 'style'));

echo head_css();
Expand Down
8 changes: 4 additions & 4 deletions css/sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
$base-font-size: 12px;
$base-line-height: 18px;

$title-stack: 'Copperplate', 'Balthazar', "Merriweather", serif;
$header-stack: 'Copperplate', 'Balthazar', "Merriweather", serif;
$minor-header-stack: Raleway, Verdana, sans-serif;
$base-font-stack: Raleway, Verdana, sans-serif;
$title-stack: "Merriweather", "Times New Roman", Times, serif;
$header-stack: "Merriweather", "Times New Roman", Times, serif;
$minor-header-stack: "Merriweather Sans", Verdana, sans-serif;
$base-font-stack: "Merriweather Sans", Verdana, sans-serif;
$monospace-stack: 'Courier New',Courier,'Lucida Sans Typewriter','Lucida Typewriter',monospace;
$blueprint-blue: #103c63;
$engine-blue: #103cb1;
Expand Down
14 changes: 7 additions & 7 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ th {
}

body {
font: 12px Raleway, Verdana, sans-serif;
font: 12px "Merriweather Sans", Verdana, sans-serif;
line-height: 18px;
color: #101010;
background: #103c63;
Expand All @@ -428,7 +428,7 @@ h1, h2, h3, h4, h5, h6 {

h1, h2, h3 {
color: #103cb1;
font-family: "Copperplate", "Balthazar", "Merriweather", serif;
font-family: "Merriweather", "Times New Roman", Times, serif;
font-weight: 400;
}

Expand All @@ -452,7 +452,7 @@ h3 {
}

h4, h5 {
font-family: Raleway, Verdana, sans-serif;
font-family: "Merriweather Sans", Verdana, sans-serif;
font-size: 15px;
line-height: 18px;
}
Expand Down Expand Up @@ -611,7 +611,7 @@ header:after {
float: left;
width: 50%;
font-weight: 700;
font-family: "Copperplate", "Balthazar", "Merriweather", serif;
font-family: "Merriweather", "Times New Roman", Times, serif;
font-variant: small-caps;
letter-spacing: .1ex;
color: #cccccc;
Expand Down Expand Up @@ -1146,7 +1146,7 @@ header:after {
}
}
#home #content h2 {
font-family: "Copperplate", "Balthazar", "Merriweather", serif;
font-family: "Merriweather", "Times New Roman", Times, serif;
font-weight: normal;
}

Expand Down Expand Up @@ -1212,7 +1212,7 @@ header:after {
height: 6em;
}
#recent-items .item h3 {
font-family: Raleway, Verdana, sans-serif;
font-family: "Merriweather Sans", Verdana, sans-serif;
font-size: 12px;
margin-top: 0;
}
Expand Down Expand Up @@ -1662,7 +1662,7 @@ ul.title-list {
}

#collection-items .item h3 {
font-family: Raleway, Verdana, sans-serif;
font-family: "Merriweather Sans", Verdana, sans-serif;
}

.collection-meta {
Expand Down

0 comments on commit 88d3876

Please sign in to comment.