From b9a00e9b83f767e8de29fe0a45f433d5b0871824 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 4 Jul 2022 20:36:19 +0100
Subject: [PATCH] Use Fira Code for all code

---
 static/src/scss/_blocks.scss                      | 8 --------
 static/src/scss/_bulma_overrides.scss             | 1 +
 static/src/scss/base.scss                         | 1 +
 templates/base.html                               | 1 +
 website/common/templates/common/content_page.html | 1 -
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/static/src/scss/_blocks.scss b/static/src/scss/_blocks.scss
index ebd5edc..8e6b0cb 100644
--- a/static/src/scss/_blocks.scss
+++ b/static/src/scss/_blocks.scss
@@ -34,11 +34,3 @@ div.block-embed {
     @include center-block(50%);
   }
 }
-
-div.block-code {
-  code,
-  pre {
-    font-family: "Fira Code", monospace;
-    font-variant-ligatures: none;
-  }
-}
diff --git a/static/src/scss/_bulma_overrides.scss b/static/src/scss/_bulma_overrides.scss
index 7ec1bcb..0ed9dc9 100644
--- a/static/src/scss/_bulma_overrides.scss
+++ b/static/src/scss/_bulma_overrides.scss
@@ -2,3 +2,4 @@
 
 $container-max-width: $widescreen;
 $pre-background: unset;
+$family-code: "Fira Code", monospace;
diff --git a/static/src/scss/base.scss b/static/src/scss/base.scss
index 11d8e98..c2deda0 100644
--- a/static/src/scss/base.scss
+++ b/static/src/scss/base.scss
@@ -17,6 +17,7 @@ body {
   height: 100%;
   display: flex;
   flex-direction: column;
+  font-variant-ligatures: none;
 }
 
 main {
diff --git a/templates/base.html b/templates/base.html
index c954997..2bac4a6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,6 +16,7 @@
 
     <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}">
     <link rel="stylesheet" type="text/css" href="{% static 'contrib/fontawesome/css/all.min.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'contrib/fira-code/fira_code.css' %}">
 
     {% block extra_css %}{% endblock %}
   </head>
diff --git a/website/common/templates/common/content_page.html b/website/common/templates/common/content_page.html
index c4eaf2a..c06adcd 100644
--- a/website/common/templates/common/content_page.html
+++ b/website/common/templates/common/content_page.html
@@ -17,7 +17,6 @@
 {% block extra_css %}
   <link rel="stylesheet" type="text/css" href="{% static 'css/lite-youtube-embed.css' %}">
   <link rel="stylesheet" type="text/css" href="{% static 'contrib/shareon/shareon.min.css' %}">
-  <link rel="stylesheet" type="text/css" href="{% static 'contrib/fira-code/fira_code.css' %}">
   <link rel="stylesheet" type="text/css" href="{% url 'static-pygments:styles' 'default' %}">
 {% endblock %}