From da67e63327ca35bded5491040e38640013dfd9cc Mon Sep 17 00:00:00 2001
From: khawkins98 <khawkins98@gmail.com>
Date: Mon, 11 Sep 2017 13:35:26 +0100
Subject: [PATCH] Trial fira in v1.3
---
css/ebi-css-build/_ebi_theme_settings.scss | 2 +-
css/ebi-css-build/ebi-global.scss | 5 +++--
libraries/Choices/assets/styles/scss/base.scss | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/css/ebi-css-build/_ebi_theme_settings.scss b/css/ebi-css-build/_ebi_theme_settings.scss
index 61e37ca6..cacb03fc 100644
--- a/css/ebi-css-build/_ebi_theme_settings.scss
+++ b/css/ebi-css-build/_ebi_theme_settings.scss
@@ -33,7 +33,7 @@ $dark-gray: #8a8a8a;
$body-background: $ebi-colour-white;
$body-font-color: $ebi-colour-dark;
-$body-font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+$body-font-family: 'Fira Sans', Helvetica, Arial, sans-serif;
$body-font-family-serif: 'EB Garamond', 'georgia', serif;
// Label tweaks
diff --git a/css/ebi-css-build/ebi-global.scss b/css/ebi-css-build/ebi-global.scss
index 4f215acd..ddf75163 100644
--- a/css/ebi-css-build/ebi-global.scss
+++ b/css/ebi-css-build/ebi-global.scss
@@ -10,9 +10,10 @@
@import 'ebi_color_styles';
@import 'ebi_clearable_inputs';
@import 'embl_selector'; // EMBL Dropdown selector for .masthead-black-bar
+@import 'https://code.cdn.mozilla.net/fonts/fira.css';
@mixin ebi-base-styles {
- body h1, body h2, body h3 { font-weight: 300; }
+ body h1, body h2, body h3, body h4, body h5 { font-weight: 600; }
li { word-wrap: break-word; }
@@ -114,7 +115,7 @@
// Breadcrumbs
.breadcrumbs { padding-top: 0.5rem; }
- body .breadcrumbs a { color: #888; }
+ body .breadcrumbs a { color: $medium-gray; border-bottom: none; }
@include ebi-code-styles;
diff --git a/libraries/Choices/assets/styles/scss/base.scss b/libraries/Choices/assets/styles/scss/base.scss
index de61bbf7..3eee8ecd 100755
--- a/libraries/Choices/assets/styles/scss/base.scss
+++ b/libraries/Choices/assets/styles/scss/base.scss
@@ -29,7 +29,7 @@ html, body {
}
body {
- font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+ font-family: 'Fira Sans', Helvetica, Arial, "Lucida Grande", sans-serif;
font-size: 16px;
line-height: 1.4;
color: #FFFFFF;
--
GitLab