MarkBind · yamgent · Feb 15, 2020 · Jan 31, 2020
diff --git a/src/page.njk b/src/page.njk
@@ -13,32 +13,26 @@
     <link rel="stylesheet" href="{{ asset.glyphicons }}">
     <link rel="stylesheet" href="{{ asset.highlight }}">
     <link rel="stylesheet" href="{{ asset.markbind }}">
-    {%- if asset.pluginLinks %}
-    {%- for link in asset.pluginLinks %}
+    {%- if asset.pluginLinks -%}
+    {%- for link in asset.pluginLinks -%}
         {{ link }}
-    {%- endfor %}
-    {%- endif %}
+    {%- endfor -%}
+    {%- endif -%}
     <link rel="stylesheet" href="{{ asset.layoutStyle }}">
-    {%- if siteNav %}
-        <link rel="stylesheet" href="{{ asset.siteNavCss }}">
-    {%- endif %}
-    {%- if pageNav %}
-        <link rel="stylesheet" href="{{ asset.pageNavCss }}">
-    {%- endif %}
-    {{ headFileBottomContent }}
-    {%- if faviconUrl %}
-        <link rel="icon" href="{{ faviconUrl }}">
-    {%- endif %}
+    {%- if siteNav -%} <link rel="stylesheet" href="{{ asset.siteNavCss }}"> {%- endif -%}
+    {%- if pageNav -%} <link rel="stylesheet" href="{{ asset.pageNavCss }}"> {%- endif -%}
+    {{- headFileBottomContent -}}
+    {%- if faviconUrl -%} <link rel="icon" href="{{ faviconUrl }}"> {%- endif -%}
 </head>
 <body {% if pageNav %} data-spy="scroll" data-target="#page-nav" data-offset="100" {% endif %}>
 <div id="app">
-    {{ headerHtml }}
+    {{ headerHtml -}}
     <div id="flex-body">
-        {{ siteNavHtml }}
+        {{ siteNavHtml -}}
         {{ content }}
-        {{ pageNavHtml }}
+        {{ pageNavHtml -}}
     </div>
-    {{ footerHtml }}
+    {{ footerHtml -}}
 </div>
 </body>
 <script src="{{ asset.vue }}"></script>
@@ -51,18 +45,15 @@
   const enableSearch = {{ enableSearch }}
 </script>
 <script src="{{ asset.setup }}"></script>
-
 {%- if asset.externalScripts %}
 {%- for script in asset.externalScripts %}
     <script src="{{ script }}"></script>
 {%- endfor %}
 {%- endif %}
-
 {%- if asset.pluginScripts %}
 {%- for script in asset.pluginScripts %}
     {{ script }}
 {%- endfor %}
 {%- endif %}
-
 <script src="{{ asset.layoutScript }}"></script>
 </html>
diff --git a/test/functional/test_site/expected/bugs/index.html b/test/functional/test_site/expected/bugs/index.html
@@ -32,7 +32,6 @@
         <br></div>
     </header>
     <div id="flex-body">
-
       <div id="content-wrapper">
         <div class="website-content">
           <p><strong>popover initiated by trigger: honor trigger attribute</strong></p>
@@ -84,7 +83,6 @@
             <a href="https://github.com">link text</a>]</p>
         </div>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -120,7 +118,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="../markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/index.html b/test/functional/test_site/expected/index.html
@@ -615,7 +615,6 @@ <h1 id="heading-in-footer-should-not-be-indexed">Heading in footer should not be
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/sub_site/index.html b/test/functional/test_site/expected/sub_site/index.html
@@ -22,9 +22,7 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <p>This is a page from another Markbind site.</p>
         <h2 id="feature-list">Feature list<a class="fa fa-anchor" href="#feature-list"></a></h2>
@@ -37,7 +35,6 @@ <h2 id="feature-list">Feature list<a class="fa fa-anchor" href="#feature-list"><
           <li>Timer – Additional fixed time restriction on the player.</li>
         </ol>
         <img src="/test_site/sub_site/images/I'm not allowed to use my favorite tool.png"></div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -73,7 +70,6 @@ <h2 id="feature-list">Feature list<a class="fa fa-anchor" href="#feature-list"><
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="../markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testAfterSetup.html b/test/functional/test_site/expected/testAfterSetup.html
@@ -22,16 +22,13 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <box id="alert-box">
           This Vue element should trigger a alert dialog when clicked on.
         </box>
         <p><span id="mouseover-span">This span should toggle the colour of the above box when hovered upon.</span></p>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -67,7 +64,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/testAfterSetup/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testAnchorGeneration.html b/test/functional/test_site/expected/testAnchorGeneration.html
@@ -22,9 +22,7 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <h1 id="root-file">Root file<a class="fa fa-anchor" href="#root-file"></a></h1>
         <h1 id="should-have-anchor">should have anchor<a class="fa fa-anchor" href="#should-have-anchor"></a></h1>
@@ -85,7 +83,6 @@ <h6 id="should-have-anchor-26">should have anchor<a class="fa fa-anchor" href="#
           </panel>
         </div>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -121,7 +118,6 @@ <h6 id="should-have-anchor-26">should have anchor<a class="fa fa-anchor" href="#
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testAntiFOUCStyles.html b/test/functional/test_site/expected/testAntiFOUCStyles.html
@@ -22,9 +22,7 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
 
         <navbar type="dark" class="temp-navbar">
@@ -58,7 +56,6 @@
         <p><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br></p>
         <p>Some text</p>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -94,7 +91,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testEmptyFrontmatter.html b/test/functional/test_site/expected/testEmptyFrontmatter.html
@@ -22,13 +22,10 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <p>A page with an empty frontmatter should still build.</p>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -64,7 +61,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testExternalScripts.html b/test/functional/test_site/expected/testExternalScripts.html
@@ -22,16 +22,13 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <p>The external script <a href="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML">MathJax 2.75</a> should be included, and the following MathJax content should render:</p>
         <box>
           When \(a \ne 0\), there are two solutions to \(ax^2 + bx + c = 0\) and they are $$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$
         </box>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -68,7 +65,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testImportVariables.html b/test/functional/test_site/expected/testImportVariables.html
@@ -22,9 +22,7 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <div></div>
         <p>Making sure the issue here <a href="https://github.com/MarkBind/markbind/commit/48b57a18a8bfd68101b163908da4a0541756364a">https://github.com/MarkBind/markbind/commit/48b57a18a8bfd68101b163908da4a0541756364a</a> is fixed.</p>
@@ -40,7 +38,6 @@ <h2 id="trying-to-access-an-imported-variable-via-namespace">Trying to access an
         <div style="color:blue">This is a deeply imported variable</div>
         Something should have appeared above in blue.
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -76,7 +73,6 @@ <h2 id="trying-to-access-an-imported-variable-via-namespace">Trying to access an
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testLayouts.html b/test/functional/test_site/expected/testLayouts.html
@@ -23,7 +23,6 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
       <nav id="site-nav" class="navbar navbar-light bg-transparent">
         <div class="border-right-grey nav-inner position-sticky slim-scroll">
@@ -35,7 +34,6 @@
       <div id="content-wrapper">
         <p><strong>Uses a front matter layout</strong></p>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -71,7 +69,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/testLayout/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testLayoutsOverride.html b/test/functional/test_site/expected/testLayoutsOverride.html
@@ -23,7 +23,6 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
       <nav id="site-nav" class="navbar navbar-light bg-transparent">
         <div class="border-right-grey nav-inner position-sticky slim-scroll">
@@ -35,7 +34,6 @@
       <div id="content-wrapper">
         <p><strong>Uses a site.json layout, overriding front matter</strong></p>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -71,7 +69,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/testLayout/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testPanelsWithImportedVariables.html b/test/functional/test_site/expected/testPanelsWithImportedVariables.html
@@ -22,9 +22,7 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <p>Refer to this comment: <a href="https://github.com/MarkBind/markbind/pull/751#issuecomment-469670640">https://github.com/MarkBind/markbind/pull/751#issuecomment-469670640</a></p>
         <div></div>
@@ -34,7 +32,6 @@
         </p>
         <p><strong>Below should be a panel, but is now an error. Uncomment it to see the error.</strong></p>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -70,7 +67,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>
diff --git a/test/functional/test_site/expected/testPlantUML.html b/test/functional/test_site/expected/testPlantUML.html
@@ -22,9 +22,7 @@
 
 <body>
   <div id="app">
-
     <div id="flex-body">
-
       <div id="content-wrapper">
         <p><strong>PlantUML Test</strong></p>
         <p><strong>Sequence Diagram</strong>
@@ -49,7 +47,6 @@
           <pic src="/test_site/diagrams/object.png"></pic>
         </p>
       </div>
-
     </div>
     <footer>
       <div class="text-center">
@@ -85,7 +82,6 @@
 
   gtag('config', 'TRACKING-ID');
 </script>
-
 <script src="markbind/layouts/default/scripts.js"></script>
 
 </html>