From 430a5e598d800464014fbd17cc744b888e073438 Mon Sep 17 00:00:00 2001
From: Daniel Oaks <daniel@danieloaks.net>
Date: Tue, 15 Feb 2022 10:11:22 +1000
Subject: [PATCH 1/2] Rough first pass at making highlighting patches work

---
 _includes/head.html                        |  1 +
 _includes/inline-code-style.css            | 78 ++++++++++++++++++++++
 content/_minutes/2022-01-28-mgm-minutes.md |  8 +--
 static/css/additional-styles.css           |  4 +-
 4 files changed, 85 insertions(+), 6 deletions(-)
 create mode 100644 _includes/inline-code-style.css

diff --git a/_includes/head.html b/_includes/head.html
index 10e7c60..8a8620c 100755
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -15,6 +15,7 @@
   <!-- Stylesheets -->
   <style>{%- include modern-normalize.css -%}</style>
   <style>{%- include inline-style.css -%}</style>
+  <style>{%- include inline-code-style.css -%}</style>
   {% if include.with_hero %}
   <style>{%- include inline-hero-style.css -%}</style>
   {% endif %}
diff --git a/_includes/inline-code-style.css b/_includes/inline-code-style.css
new file mode 100644
index 0000000..eef1ace
--- /dev/null
+++ b/_includes/inline-code-style.css
@@ -0,0 +1,78 @@
+.highlight table td { padding: 5px; }
+.highlight table pre { margin: 0; }
+.highlight, .highlight .w {
+  color: #f8f8f2;
+  background-color: #272822;
+}
+.highlight .err {
+  color: #151515;
+  background-color: #ac4142;
+}
+.highlight .c, .highlight .cd, .highlight .cm, .highlight .c1, .highlight .cs {
+  color: #505050;
+}
+.highlight .cp {
+  color: #f4bf75;
+}
+.highlight .nt {
+  color: #f4bf75;
+}
+.highlight .o, .highlight .ow {
+  color: #d0d0d0;
+}
+.highlight .p, .highlight .pi {
+  color: #d0d0d0;
+}
+.highlight .gi {
+  color: #90a959;
+}
+.highlight .gd {
+  color: #ac4142;
+}
+.highlight .gh {
+  color: #6a9fb5;
+  background-color: #151515;
+  font-weight: bold;
+}
+.highlight .k, .highlight .kn, .highlight .kp, .highlight .kr, .highlight .kv {
+  color: #aa759f;
+}
+.highlight .kc {
+  color: #d28445;
+}
+.highlight .kt {
+  color: #d28445;
+}
+.highlight .kd {
+  color: #d28445;
+}
+.highlight .s, .highlight .sb, .highlight .sc, .highlight .sd, .highlight .s2, .highlight .sh, .highlight .sx, .highlight .s1 {
+  color: #90a959;
+}
+.highlight .sr {
+  color: #75b5aa;
+}
+.highlight .si {
+  color: #8f5536;
+}
+.highlight .se {
+  color: #8f5536;
+}
+.highlight .nn {
+  color: #f4bf75;
+}
+.highlight .nc {
+  color: #f4bf75;
+}
+.highlight .no {
+  color: #f4bf75;
+}
+.highlight .na {
+  color: #6a9fb5;
+}
+.highlight .m, .highlight .mf, .highlight .mh, .highlight .mi, .highlight .il, .highlight .mo, .highlight .mb, .highlight .mx {
+  color: #90a959;
+}
+.highlight .ss {
+  color: #90a959;
+}
diff --git a/content/_minutes/2022-01-28-mgm-minutes.md b/content/_minutes/2022-01-28-mgm-minutes.md
index 2f6b23d..9c1d564 100644
--- a/content/_minutes/2022-01-28-mgm-minutes.md
+++ b/content/_minutes/2022-01-28-mgm-minutes.md
@@ -29,7 +29,7 @@ This has previously been discussed on the [July 2021 MGM][2021-07-sm], and the
 <details>
 <summary>Patch for bylaws change</summary>
 
-```patch
+{% highlight diff %}
  bylaws.md | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 89 insertions(+)
 
@@ -133,7 +133,7 @@ index 0000000..0000000 100644
  ## Specialised Committees
 
  1. There are three specialised committees: Operations, Engineering, and
-```
+{% endhighlight %}
 
 </details>
 
@@ -149,7 +149,7 @@ adopted. This increases the retention period for abuse mitigation data.
 <details>
 <summary>Patch for privacy policy change</summary>
 
-```patch
+{% highlight diff %}
  privacy.md | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
@@ -174,7 +174,7 @@ index 0000000..0000000 100644
  Data collected by email or our support system in relation to project
  registration, sponsorship and channel namespace management will be stored at
  least until the project is deregistered or the sponsorship is terminated, this
-```
+{% endhighlight %}
 
 </details>
 
diff --git a/static/css/additional-styles.css b/static/css/additional-styles.css
index 16a82d2..0c3253e 100644
--- a/static/css/additional-styles.css
+++ b/static/css/additional-styles.css
@@ -25,8 +25,8 @@
   font-display: swap;
 }
 
-code, pre, kbd {
-  font-family: 'Ubuntu Mono', monospace;
+code, pre, kbd, code *, pre *, kbd * {
+  font-family: 'Ubuntu Mono', monospace !important;
   background-color: var(--c-bg-secondary);
   overflow-x: auto;
   border-radius: .3rem;

From 76edf3cc87981085391445bce1fb728fd9a515a4 Mon Sep 17 00:00:00 2001
From: Daniel Oaks <daniel@danieloaks.net>
Date: Tue, 15 Feb 2022 20:39:48 +1000
Subject: [PATCH 2/2] Include code styling as a stylesheet, not inline

---
 _includes/head.html                                          | 2 +-
 _includes/inline-code-style.css => static/css/code-style.css | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename _includes/inline-code-style.css => static/css/code-style.css (100%)

diff --git a/_includes/head.html b/_includes/head.html
index 8a8620c..65a3b1d 100755
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -15,7 +15,6 @@
   <!-- Stylesheets -->
   <style>{%- include modern-normalize.css -%}</style>
   <style>{%- include inline-style.css -%}</style>
-  <style>{%- include inline-code-style.css -%}</style>
   {% if include.with_hero %}
   <style>{%- include inline-hero-style.css -%}</style>
   {% endif %}
@@ -23,5 +22,6 @@
   <style>{%- include inline-aside-style.css -%}</style>
   {% endif %}
   <link rel="stylesheet" href="/static/css/additional-styles.css">
+  <link rel="stylesheet" href="/static/css/code-style.css">
   <script src="/static/js/header-links.js" defer></script>
 </head>
diff --git a/_includes/inline-code-style.css b/static/css/code-style.css
similarity index 100%
rename from _includes/inline-code-style.css
rename to static/css/code-style.css