Merge pull request #95 from project-lovelace/ali/mathjax3

Update to MathJax3 rolling release
project-lovelace · Mar 28, 2021 · 983f13d · 983f13d
2 parents 4c7cbef + 879d0c5
commit 983f13d
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 59 deletions.
diff --git a/src/problems/templates/problems/index.html b/src/problems/templates/problems/index.html
@@ -4,15 +4,6 @@
   Problems | Project Lovelace
 {% endblock %}
 
-{% block preload_javascript %}
-<!-- MathJax -->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});
-</script>
-<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML' async></script>
-{% endblock %}
-
-
 {% block body %}
 <br>
 <section classs="section">

diff --git a/src/problems/templates/problems/problem.html b/src/problems/templates/problems/problem.html
@@ -6,15 +6,10 @@
 
 {% block preload_javascript %}
 
-{% block problem_javascript %}{% endblock %}
+<link rel="stylesheet" href="{% static 'css/problem.css' %}">
 
-<!-- MathJax -->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});
-</script>
-<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML' async></script>
+{% block problem_javascript %}{% endblock %}
 
-<link rel="stylesheet" href="{% static 'css/problem.css' %}">
 {% endblock %}
 
 {% block page_title %}

diff --git a/src/templates/about.html b/src/templates/about.html
@@ -5,14 +5,6 @@
 About | Project Lovelace
 {% endblock %}
 
-{% block preload_javascript %}
-<!-- MathJax -->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});
-</script>
-<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML' async></script>
-{% endblock %}
-
 {% block body %}
 <section classs="section">
   <div class="container">

diff --git a/src/templates/base.html b/src/templates/base.html
@@ -3,46 +3,62 @@
 
 {% load static %}
 
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>
-        {% block page_title %}
-            Project Lovelace
-        {% endblock %}
-    </title>
-    <style>
-      .Site {
-        display: flex;
-        min-height: 100vh;
-        flex-direction: column;
-      }
-      .Site-content {
-        flex: 1;
-      }
-    </style>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>
+      {% block page_title %}
+          Project Lovelace
+      {% endblock %}
+  </title>
+  <style>
+    .Site {
+      display: flex;
+      min-height: 100vh;
+      flex-direction: column;
+    }
+    .Site-content {
+      flex: 1;
+    }
+  </style>
+
+  <link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/apple-touch-icon.png' %}">
+  <link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon-32x32.png' %}">
+  <link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon-16x16.png' %}">
+  <link rel="mask-icon" href="{% static 'img/safari-pinned-tab.svg' %}" color="#5bbad5">
 
-    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/apple-touch-icon.png' %}">
-    <link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon-32x32.png' %}">
-    <link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon-16x16.png' %}">
-    <link rel="mask-icon" href="{% static 'img/safari-pinned-tab.svg' %}" color="#5bbad5">
+  <!-- Bulma -->
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.9.2/css/bulma.min.css" integrity="sha512-byErQdWdTqREz6DLAA9pCnLbdoGGhXfU6gm1c8bkf7F51JVmUBlayGe2A31VpXWQP+eiJ3ilTAZHCR3vmMyybA==" crossorigin="anonymous" />
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bulma-divider.min.css" integrity="sha256-rFnzhAMFs9eETsAfAAvhzFLWW8SCqUpBjCboDB6ITtg=" crossorigin="anonymous">
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.9.2/css/bulma.min.css" integrity="sha512-byErQdWdTqREz6DLAA9pCnLbdoGGhXfU6gm1c8bkf7F51JVmUBlayGe2A31VpXWQP+eiJ3ilTAZHCR3vmMyybA==" crossorigin="anonymous" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bulma-divider.min.css" integrity="sha256-rFnzhAMFs9eETsAfAAvhzFLWW8SCqUpBjCboDB6ITtg=" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
+  <!-- Font Awesome -->
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
+
+  <!-- MathJax -->
+  <script type="text/javascript" id="MathJax-script" async
+    src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js">
+  </script>
+  <script>
+    MathJax = {
+      tex: {
+        inlineMath: [['$', '$'], ['\\(', '\\)']]
+      }
+    };
+  </script>
 
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-128628724-1"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
+  <!-- Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-128628724-1"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
 
-      gtag('config', 'UA-128628724-1');
-    </script>
+    gtag('config', 'UA-128628724-1');
+  </script>
 
-    {% block preload_javascript %}
-    {% endblock %}
-  </head>
+  {% block preload_javascript %}
+  {% endblock %}
+</head>
 
 <body class="Site">
   {% include "navbar.html" %}