diff --git a/css/ebi-css-build/_ebi_theme_settings.scss b/css/ebi-css-build/_ebi_theme_settings.scss index 16a009193abdffa0e8cdcafcbbd30a5836afde8e..114921c19bbef1c3ae8b0d0ff6e8f7a68e667f5b 100644 --- a/css/ebi-css-build/_ebi_theme_settings.scss +++ b/css/ebi-css-build/_ebi_theme_settings.scss @@ -38,9 +38,9 @@ $body-background: $ebi-colour-white; // typography $body-antialiased: true; $body-font-color: $ebi-colour-dark; -$body-font-family: Helvetica, Arial, FreeSans, 'Liberation Sans', sans-serif; -$body-font-family-serif: 'EB Garamond', 'georgia', serif; -$code-font-family: Consolas, 'Liberation Mono', Courier, monospace; +$body-font-family: "IBM Plex Sans", Helvetica, Arial, sans-serif; +$body-font-family-serif: "IBM Plex Mono", Monaco, Consolas, "Lucida Console", monospace; +$code-font-family: "IBM Plex Mono", Monaco, Consolas, "Lucida Console", monospace; $table-font-family: $body-font-family; $table-font-size: 1rem; diff --git a/css/ebi-css-build/ebi-global.scss b/css/ebi-css-build/ebi-global.scss index 48504efcfe48745f29d969a3ccfaaa4ea582c067..06a8e36a544124fcb52f456be1a45792e4c8d423 100644 --- a/css/ebi-css-build/ebi-global.scss +++ b/css/ebi-css-build/ebi-global.scss @@ -27,6 +27,13 @@ @include embl-selector; } @if $include-ebi-extra-styles { + // Plex fonts + @import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,200;0,400;0,600;0,700;1,200;1,400;1,600;1,700&display=swap'); + @import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,300;0,400;0,500;1,500&display=swap'); + + // Alternatively we could use the CDN, but for legacy v1.x sites, google fonts will be cleaner + // @import url('https://dev.assets.emblstatic.net/vf/v2.1.0/assets/vf-font-plex-sans/vf-font-plex-sans.css'); + // @import url('https://dev.assets.emblstatic.net/vf/v2.1.0/assets/vf-font-plex-mono/vf-font-plex-mono.css'); @include ebi-print-styles; @include ebi-clearable-inputs; @include ebi-table-styles; diff --git a/local-dev.html b/local-dev.html index 5b0b75c5cb4b3acefa4ab1c50bbb0a2688863681..d23a1a569b2a81d2d9ffc0658c147b1fc3905e52 100755 --- a/local-dev.html +++ b/local-dev.html @@ -140,12 +140,11 @@ </footer> <!-- JavaScript --> - <script>window.jQuery || document.write('<script src="js/libs/jquery-1.10.2.min.js"><\/script>')</script> - + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script defer="defer" src="js/script.js"></script> <!-- The Foundation theme JavaScript --> - <script src="js/foundation.js"></script> + <script src="libraries/foundation-6/js/foundation.js"></script> <script src="js/foundationExtendEBI.js"></script> <script type="text/JavaScript">$(document).foundation();</script> <script type="text/JavaScript">$(document).foundationExtendEBI();</script>