WIP: Refactoring

1 files changed, 5 insertions, 14 deletions

diff --git a/internal/port/tpl/gopher.html b/internal/port/tpl/gopher.html
index c971847..5436123 100644
--- a/internal/port/tpl/gopher.html
+++ b/internal/port/tpl/gopher.html
@@ -31,25 +31,16 @@
     </header>
 
                 <main class="wrap">
-                        <pre class="content content--has-monospace-font{{ if not .IsPlain }} content--has-type-annotations{{ end }}">
-        {{- $content := "" -}}
+      <div class="content content--monospace{{ if not .IsPlain }} content--has-type-annotations{{ end }}">
         {{- $page := . -}}
         {{- range .Lines -}}
-          {{- if ne $content "" -}}
-            {{- $content = printf "%s\n" $content -}}
-          {{- end -}}
-          {{- if $page.IsPlain -}}
-            {{- $content = printf "%s%s" $content (.Text | HTMLEscape) -}}
+          {{- if .Link -}}
+            <div class="section"><span class="section__type">{{- .Type -}}</span><a class="section__content" href="{{ .Link }}">{{- .Text -}}</a></div>
           {{- else -}}
-            {{- if .Link -}}
-              {{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">%s  </span><a class=\"link link--%s\" href=\"%s\">%s</a>" .Type .Type .Link (.Text | HTMLEscape)) -}}
-            {{- else -}}
-              {{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">     </span>%s" (.Text | HTMLEscape)) -}}
-            {{- end -}}
+            <div class="section"><span class="section__type"></span><pre class="section__content">{{- .Text -}}</pre></div>
           {{- end -}}
         {{- end -}}
-        {{- $content | safeHtml -}}
-                        </pre>
+                        </div>
                 </main>
 
                 {{- template "_modals.html" . -}}