Fix #1840. Restore glossary page rendering. (#1841)

Author: scottmakestech

layouts/shortcodes/def.html

@@ -1,21 +1,20 @@
-{{ $_hugo_config := `{ "version": 1 }` }}
 <!--
 Usage (in english):
 	{% def
 		id="a unique id for anchor"
 		name="The term to define (optional if abbr is provided)"
 		abbr="an acronym (optional)"
 		abbr_first="1 (When the acronym is more important, such as RSA or SSL)" %}
-			the definition 
+			the definition
 	{% /def %}
-	
+
 	<p><dfn id="a unique id for anchor">The term to define</dfn>: the definition</p>
 	<p><dfn id="a unique id for anchor"><abbr>an acronym</abbr</dfn>: the definition</p>
 	<p><dfn id="a unique id for anchor">The term to define</dfn> (<abbr>an acronym</abbr>): the definition</p>
 
 Usage (in other languages):
-	{% def 
-		id="a unique id for anchor - the SAME than for english" 
+	{% def
+		id="a unique id for anchor - the SAME than for english"
 		name="The term to define (optional if english or abbr is provided)"
 		abbr="an acronym (optional)"
 		english="the english term (optional - if present the abbr is in english too)"

layouts/shortcodes/renderglossary.html

@@ -1,5 +1,6 @@
+<dl>
 {{ range (.Page.Scratch.GetSortedMapValues "glossary") }}
-<p class="definition">
+<dt class="term">
 	<a href="#def-{{.id }}">
 	{{- if and (.abbr) (eq (.abbr_first) "1") -}}
 			<dfn id="def-{{.id }}"><abbr lang="en">{{ .abbr }}</abbr></dfn>
@@ -24,8 +25,8 @@
 		{{- end -}}
 	{{- end -}}
 	</a>
-	{{ .Site.Params.beforeColon | safeHTML }}: {{ .content }}
-</p>
-
+</dt>
+<dd class="definition">{{ .content | markdownify }}</dd>
 {{ end }}
 
+</dl>

static/css/glossary.css

@@ -12,6 +12,10 @@ dfn {
   padding-right: .25em; /* Prevent italics text from hitting the ":" */
 }
 
+.definition {
+  margin-bottom: 1em;
+}
+
 .definition>a:first-child {
   text-decoration: none;
   color: inherit;