diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-08-21 10:47:18 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-08-21 10:47:18 +0100 |
| commit | 8900b9ee3f359e3eff316ff3f5b2410cfc643cbd (patch) | |
| tree | cb2d20d5ad71d046fc4dad754a4dc3de858c3a63 | |
| parent | 555de97291aef7f8b3d2547f6e8f1c2c6e8f4eba (diff) | |
| parent | 17859db585cc6546aae04064ca748cacce6c1ff5 (diff) | |
Merge branch 'swap-typeface' into develop
| -rw-r--r-- | assets/stylesheets/responsive/custom.scss | 3 | ||||
| -rw-r--r-- | lib/views/general/_before_head_end.html.erb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index 66e83e2..f77638e 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -19,8 +19,7 @@ $body-bg: $color_neutral_light; $body-font-color: $color_neutral_dark; $link-color: darken($color_blue, 20%); $action-color: $color_green; -$font-family: "Roboto Slab", Georgia, serif; -$sans-serif-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; $form_input-bg: $color_white; $button-bg: $action-color; diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb index 19a54a0..b6794e4 100644 --- a/lib/views/general/_before_head_end.html.erb +++ b/lib/views/general/_before_head_end.html.erb @@ -1 +1 @@ - <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto+Slab:400,700&subset=latin,latin-ext,cyrillic,cyrillic-ext"> +<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'> |