Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yamgent merged 1 commit into from
Feb 15, 2020
Merged

Remove extra blank lines from page.njk output #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions src/page.njk
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
3 changes: 0 additions & 3 deletions test/functional/test_site/expected/bugs/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
<a href="https://github.com">link text</a>]</p>
</div>
</div>

</div>
<footer>
<div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>
1 change: 0 additions & 1 deletion test/functional/test_site/expected/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/sub_site/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testAfterSetup.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testAnchorGeneration.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testAntiFOUCStyles.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
<div id="app">

<div id="flex-body">

<div id="content-wrapper">

<navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testEmptyFrontmatter.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testExternalScripts.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testImportVariables.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>
3 changes: 0 additions & 3 deletions test/functional/test_site/expected/testLayouts.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
<div id="content-wrapper">
<p><strong>Uses a front matter layout</strong></p>
</div>

</div>
<footer>
<div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>
3 changes: 0 additions & 3 deletions test/functional/test_site/expected/testLayoutsOverride.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testPanelsWithImportedVariables.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
4 changes: 0 additions & 4 deletions test/functional/test_site/expected/testPlantUML.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
<pic src="/test_site/diagrams/object.png"></pic>
</p>
</div>

</div>
<footer>
<div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

yamgent
merged 1 commit into

from

Feb 15, 2020
 Merged


Remove extra blank lines from page.njk output
#1005
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 12 additions & 21 deletions
src/page.njk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/bugs/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
 <a href="https://github.com">link text</a>]</p>
 </div>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>

1 change: 0 additions & 1 deletion
test/functional/test_site/expected/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/sub_site/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAfterSetup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAnchorGeneration.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAntiFOUCStyles.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
 <div id="app">

 <div id="flex-body">

 <div id="content-wrapper">

 <navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testEmptyFrontmatter.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testExternalScripts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testImportVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayouts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
 <div id="content-wrapper">
 <p><strong>Uses a front matter layout</strong></p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayoutsOverride.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPanelsWithImportedVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPlantUML.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
 <pic src="/test_site/diagrams/object.png"></pic>
 </p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

yamgent
merged 1 commit into

from

Feb 15, 2020
 Merged


Remove extra blank lines from page.njk output
#1005
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 12 additions & 21 deletions
src/page.njk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/bugs/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
 <a href="https://github.com">link text</a>]</p>
 </div>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>

1 change: 0 additions & 1 deletion
test/functional/test_site/expected/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/sub_site/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAfterSetup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAnchorGeneration.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAntiFOUCStyles.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
 <div id="app">

 <div id="flex-body">

 <div id="content-wrapper">

 <navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testEmptyFrontmatter.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testExternalScripts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testImportVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayouts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
 <div id="content-wrapper">
 <p><strong>Uses a front matter layout</strong></p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayoutsOverride.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPanelsWithImportedVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPlantUML.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
 <pic src="/test_site/diagrams/object.png"></pic>
 </p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

yamgent
merged 1 commit into

from

Feb 15, 2020
 Merged


Remove extra blank lines from page.njk output
#1005
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 12 additions & 21 deletions
src/page.njk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/bugs/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
 <a href="https://github.com">link text</a>]</p>
 </div>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>

1 change: 0 additions & 1 deletion
test/functional/test_site/expected/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/sub_site/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAfterSetup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAnchorGeneration.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAntiFOUCStyles.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
 <div id="app">

 <div id="flex-body">

 <div id="content-wrapper">

 <navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testEmptyFrontmatter.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testExternalScripts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testImportVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayouts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
 <div id="content-wrapper">
 <p><strong>Uses a front matter layout</strong></p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayoutsOverride.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPanelsWithImportedVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPlantUML.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
 <pic src="/test_site/diagrams/object.png"></pic>
 </p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

yamgent
merged 1 commit into

from

Feb 15, 2020
 Merged


Remove extra blank lines from page.njk output
#1005
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 12 additions & 21 deletions
src/page.njk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/bugs/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
 <a href="https://github.com">link text</a>]</p>
 </div>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>

1 change: 0 additions & 1 deletion
test/functional/test_site/expected/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/sub_site/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAfterSetup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAnchorGeneration.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAntiFOUCStyles.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
 <div id="app">

 <div id="flex-body">

 <div id="content-wrapper">

 <navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testEmptyFrontmatter.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testExternalScripts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testImportVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayouts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
 <div id="content-wrapper">
 <p><strong>Uses a front matter layout</strong></p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayoutsOverride.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPanelsWithImportedVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPlantUML.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
 <pic src="/test_site/diagrams/object.png"></pic>
 </p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

yamgent
merged 1 commit into

from

Feb 15, 2020
 Merged


Remove extra blank lines from page.njk output
#1005
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 12 additions & 21 deletions
src/page.njk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/bugs/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
 <a href="https://github.com">link text</a>]</p>
 </div>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>

1 change: 0 additions & 1 deletion
test/functional/test_site/expected/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/sub_site/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAfterSetup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAnchorGeneration.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAntiFOUCStyles.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
 <div id="app">

 <div id="flex-body">

 <div id="content-wrapper">

 <navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testEmptyFrontmatter.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testExternalScripts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testImportVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayouts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
 <div id="content-wrapper">
 <p><strong>Uses a front matter layout</strong></p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayoutsOverride.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPanelsWithImportedVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPlantUML.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
 <pic src="/test_site/diagrams/object.png"></pic>
 </p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

yamgent
merged 1 commit into

from

Feb 15, 2020
 Merged


Remove extra blank lines from page.njk output
#1005
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 12 additions & 21 deletions
src/page.njk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/bugs/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
 <a href="https://github.com">link text</a>]</p>
 </div>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>

1 change: 0 additions & 1 deletion
test/functional/test_site/expected/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/sub_site/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAfterSetup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAnchorGeneration.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAntiFOUCStyles.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
 <div id="app">

 <div id="flex-body">

 <div id="content-wrapper">

 <navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testEmptyFrontmatter.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testExternalScripts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testImportVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayouts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
 <div id="content-wrapper">
 <p><strong>Uses a front matter layout</strong></p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayoutsOverride.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPanelsWithImportedVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPlantUML.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
 <pic src="/test_site/diagrams/object.png"></pic>
 </p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove extra blank lines from page.njk output#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

yamgent
merged 1 commit into

from

Feb 15, 2020
 Merged


Remove extra blank lines from page.njk output
#1005
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 12 additions & 21 deletions
src/page.njk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/bugs/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -84,7 +83,6 @@
 <a href="https://github.com">link text</a>]</p>
 </div>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -120,7 +118,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="../markbind/layouts/default/scripts.js"></script>

</html>

1 change: 0 additions & 1 deletion
test/functional/test_site/expected/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/sub_site/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAfterSetup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -67,7 +64,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testAfterSetup/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAnchorGeneration.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -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>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testAntiFOUCStyles.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@

<body>
 <div id="app">

 <div id="flex-body">

 <div id="content-wrapper">

 <navbar type="dark" class="temp-navbar">
Expand DownExpand Up@@ -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">
Expand DownExpand Up@@ -94,7 +91,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testEmptyFrontmatter.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -64,7 +61,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testExternalScripts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand DownExpand Up@@ -68,7 +65,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testImportVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -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>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayouts.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -35,7 +34,6 @@
 <div id="content-wrapper">
 <p><strong>Uses a front matter layout</strong></p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

3 changes: 0 additions & 3 deletions
test/functional/test_site/expected/testLayoutsOverride.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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">
Expand All@@ -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">
Expand DownExpand Up@@ -71,7 +69,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/testLayout/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPanelsWithImportedVariables.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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">
Expand DownExpand Up@@ -70,7 +67,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>

4 changes: 0 additions & 4 deletions
test/functional/test_site/expected/testPlantUML.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -49,7 +47,6 @@
 <pic src="/test_site/diagrams/object.png"></pic>
 </p>
 </div>

 </div>
 <footer>
 <div class="text-center">
Expand DownExpand Up@@ -85,7 +82,6 @@

 gtag('config', 'TRACKING-ID');
</script>

<script src="markbind/layouts/default/scripts.js"></script>

</html>
Loading