From 48fa454bf8930dcb0adeba70569d0c8f26e25e38 Mon Sep 17 00:00:00 2001
From: Marc Foley <m.foley.88@gmail.com>
Date: Thu, 29 Jun 2023 10:36:46 +0100
Subject: [PATCH 1/2] toggle: first before and after toggle

---
 src/diffenator2/templates/diffbrowsers_glyphs.html    | 2 +-
 src/diffenator2/templates/diffbrowsers_waterfall.html | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/diffenator2/templates/diffbrowsers_glyphs.html b/src/diffenator2/templates/diffbrowsers_glyphs.html
index 7ecb13c..94aa722 100644
--- a/src/diffenator2/templates/diffbrowsers_glyphs.html
+++ b/src/diffenator2/templates/diffbrowsers_glyphs.html
@@ -22,7 +22,7 @@
   {% for font_class in font_styles or font_styles_old or font_styles_new %}
       <div class="box">
 	<div class="box-title">{{ font_class.class_name }} {{ pt_size }}pt</div>
-	  <span class="{{ font_class.class_name }}" style="font-size: {{ pt_size }}pt">
+	  <span class="box-text {{ font_class.class_name }}" style="font-size: {{ pt_size }}pt">
 	    {% for character in characters %}
 	      <div class="cell">{{ character }}</div>
 	    {% endfor %}
diff --git a/src/diffenator2/templates/diffbrowsers_waterfall.html b/src/diffenator2/templates/diffbrowsers_waterfall.html
index 660b23c..6159bb6 100644
--- a/src/diffenator2/templates/diffbrowsers_waterfall.html
+++ b/src/diffenator2/templates/diffbrowsers_waterfall.html
@@ -8,13 +8,13 @@
   {% for font_class in font_styles or font_styles_old or font_styles_new %}
     {% for pt_size in [7, 10, 11, 12, 14, 16, 18, 21, 27, 32] %}
       <div class="box">
-	<div class="box-title">{{ font_class.class_name }} {{ pt_size }}pt</div>
-	<span class="{{ font_class.class_name }}" style="font-size: {{ pt_size }}pt">
+        <div class="box-title">{{ font_class.class_name }} {{ pt_size }}pt</div>
+        <div class="box-text {{ font_class.class_name }}" style="font-size: {{ pt_size }}pt">
             QUICK WAFTING ZEPHYRS VEX BOLD JIM.<br>
             quick wafting zephyrs vex bold jim.<br>
             $14.95<br>
-          </span>
-       </div>
+        </div>
+      </div>
     {% endfor %}
   {% endfor %}
 {% endblock %}

From e81123fbf17f5f1323fe1ecb07abdbcfe215958c Mon Sep 17 00:00:00 2001
From: Marc Foley <m.foley.88@gmail.com>
Date: Thu, 29 Jun 2023 10:43:26 +0100
Subject: [PATCH 2/2] templates: move tree code out of _base.html

---
 src/diffenator2/templates/_base.html      | 31 -----------------------
 src/diffenator2/templates/diffenator.html | 31 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/diffenator2/templates/_base.html b/src/diffenator2/templates/_base.html
index ec2bced..96f9ee2 100644
--- a/src/diffenator2/templates/_base.html
+++ b/src/diffenator2/templates/_base.html
@@ -211,37 +211,6 @@ <h2>{% block content_name %}{% endblock %}</h2>
 		fontToggle.addEventListener("click", switchFonts);
 	}
 
-	function render(node, toplevel) {
-		var wrapper = $("<div> </div>");
-		if (!node) { return wrapper }
-		if (Array.isArray(node)) {
-			var before = $("<span/>");
-			before.addClass("attr-before");
-			before.html(" " + node[0] + " ");
-			var after = $("<span/>");
-			after.addClass("attr-after");
-			after.append(node[1]);
-			wrapper.append(before);
-			wrapper.append(after);
-			return wrapper
-		}
-		for (const [key, value] of Object.entries(node)) {
-			var display = $("<div/>");
-			display.addClass("node")
-			if (!toplevel && ! key.match(/^\d+$/)) {
-				display.hide()
-			}
-			display.append(key);
-			display.append(render(value, false).children());
-			wrapper.append(display)
-		}
-		return wrapper
-
-	}
-	$(function() {
-		$("#difftable").append(render(fontdiff, true).children())
-		$(".node").on("click", function(event){ $(this).children().toggle(); event.stopPropagation() })
-	});
     {% block js %}
 	{% endblock %}
 
diff --git a/src/diffenator2/templates/diffenator.html b/src/diffenator2/templates/diffenator.html
index 8496e58..e8526cc 100644
--- a/src/diffenator2/templates/diffenator.html
+++ b/src/diffenator2/templates/diffenator.html
@@ -113,6 +113,37 @@
   {% endfor %}
 {% endblock %}
 {% block js %}
+	function render(node, toplevel) {
+		var wrapper = $("<div> </div>");
+		if (!node) { return wrapper }
+		if (Array.isArray(node)) {
+			var before = $("<span/>");
+			before.addClass("attr-before");
+			before.html(" " + node[0] + " ");
+			var after = $("<span/>");
+			after.addClass("attr-after");
+			after.append(node[1]);
+			wrapper.append(before);
+			wrapper.append(after);
+			return wrapper
+		}
+		for (const [key, value] of Object.entries(node)) {
+			var display = $("<div/>");
+			display.addClass("node")
+			if (!toplevel && ! key.match(/^\d+$/)) {
+				display.hide()
+			}
+			display.append(key);
+			display.append(render(value, false).children());
+			wrapper.append(display)
+		}
+		return wrapper
+
+	}
+	$(function() {
+		$("#difftable").append(render(fontdiff, true).children())
+		$(".node").on("click", function(event){ $(this).children().toggle(); event.stopPropagation() })
+	});
 
 function wordBreaks() {
   words = document.getElementsByClassName("cell-word")