aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-06-02 13:41:16 +0100
committerLouise Crow <louise.crow@gmail.com>2014-06-02 13:41:16 +0100
commitf23f1073ee2dd3510fad03f9c8b8324e9ef44bc7 (patch)
treeca5d3915dafb4dbb390fe024a60bc3be9e7aee7f
parent00b41969dc7bc93d448487bce913bc2c30b019cf (diff)
Add Google fonts with some basic fallbacks.
-rw-r--r--assets/stylesheets/responsive/custom.scss8
-rw-r--r--lib/views/general/_before_head_end.html.erb1
2 files changed, 7 insertions, 2 deletions
diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss
index 0a94db8..8dda7ce 100644
--- a/assets/stylesheets/responsive/custom.scss
+++ b/assets/stylesheets/responsive/custom.scss
@@ -7,7 +7,9 @@ $body-bg: #f7eee1;
$button-bg: #8b9352;
$button-color: #fff;
$heading-color: #3d3b38;
-$font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+$font-family: "Roboto Slab", Georgia, serif;
+$sans-serif-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+$heading-font-family: "Bitter", Georgia, serif;
$main_menu-bg: #2c5d74;
$main_menu-search_text: #333;
@@ -106,6 +108,7 @@ a{
h1, h2, h3, h4, h5, h6 {
color: $heading-color;
+ font-family: $heading-font-family;
}
/* Let h1s be a little smaller on small screens */
@@ -317,7 +320,7 @@ a.link_button_green_large {
}
a {
@extend .menu-item;
-
+ font-family: $sans-serif-font-family;
@include respond-min( $main_menu-mobile_menu_cutoff ){
padding: 0.5em 0.2em;
background-color: $locale-bg;
@@ -383,6 +386,7 @@ a.link_button_green_large {
background-color: $footer-bg;
color: $footer-color;
padding: 2em 4em;
+ font-family: $sans-serif-font-family;
a {
text-decoration: none;
color: $footer-link-color;
diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb
new file mode 100644
index 0000000..4fc693a
--- /dev/null
+++ b/lib/views/general/_before_head_end.html.erb
@@ -0,0 +1 @@
+ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Bitter|Roboto+Slab">