classic-jekyll-theme 1.9.4 → 2.0.0

data/_includes/widgets/recent-posts.html

@@ -1,4 +1,7 @@
-{% comment %}
+
+<!-- include recent-posts.html -->
+{%- if jekyll.environment != 'production' and site.data.setup.fast-content-build -%}{%- else -%}
+{%- comment -%}<!--
 
 Usage:
 
@@ -6,13 +9,16 @@ Configure the number of referenced posts by assigning a value to `number-of-rece
 
 Configure the text for the header message in "_data/text-for.yml" for the item `tRecent`.
 
-{% endcomment %}
+-->{%- endcomment %}
 <div>
-	{% assign recent = 'Recent' %}
-	{% if site.data.text-for.tRecent %}{% assign recent = site.data.text-for.tRecent %}{% endif %}
+	{%- assign recent = 'Recent' -%}
+	{%- if site.data.text-for.tRecent -%}
+		{%- assign recent = site.data.text-for.tRecent -%}
+	{%- endif %}
 	<h1>{{ recent }}:</h1>
-	{% for post in site.posts limit: site.data.setup.number-of-recent-posts-in-widget %}
-		<p><a href="{{ post.url }}">{% if post.date %}{{ post.date | date: "%F" }}{% endif %} {{ post.title }}</a></p>
-	{% endfor %}
+	{%- for post in site.posts limit: site.data.setup.number-of-recent-posts-in-widget %}
+		<p><a href="{{ post.url | relative_url }}">{% if post.date %}{{ post.date | date: "%F" }}{% endif %} {{ post.title }}</a></p>
+	{%- endfor %}
 </div>
-
+{%- endif %}
+<!-- end of include recent-posts.html -->

data/_includes/widgets/social-media-res/icon-github.html

@@ -1 +1,7 @@
-<a href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include widgets/social-media-res/icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>
+
+<!-- include icon-github.html -->
+<a href="https://github.com/{{ include.username }}">
+	<span class="icon icon--github">{%- include widgets/social-media-res/icon-github.svg -%}</span>
+	<span class="username">{{ include.username }}</span>
+</a>
+<!-- end of include icon-github.html -->

data/_includes/widgets/social-media-res/icon-github.svg

@@ -1 +1 @@
-<svg viewBox="0 0 16 16" width="16px" height="16px"><path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/></svg>
+<svg viewBox="0 0 16 16" width="16px" height="16px"><path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/></svg>

data/_includes/widgets/social-media-res/icon-twitter.html

@@ -1 +1,7 @@
-<a href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include widgets/social-media-res/icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>
+
+<!-- include icon-twitter.html -->
+<a href="https://twitter.com/{{ include.username }}">
+	<span class="icon icon--twitter">{%- include widgets/social-media-res/icon-twitter.svg -%}</span>
+	<span class="username">{{ include.username }}</span>
+</a>
+<!-- end of include icon-twitter.html -->

data/_includes/widgets/social-media-res/icon-twitter.svg

@@ -1 +1 @@
-<svg viewBox="0 0 16 16" width="16px" height="16px"><path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/></svg>
+<svg viewBox="0 0 16 16" width="16px" height="16px"><path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/></svg>

data/_includes/widgets/social-media.html

@@ -1,4 +1,6 @@
-{% comment %}
+
+<!-- include social-media.html -->
+{%- comment -%}<!--
 
 Usage:
 
@@ -6,15 +8,22 @@ Configure the github-username and twitter-username in `_config.yml`.
 
 Configure the text for the header message in "_data/text-for.yml" for the item `tSocialMediaResources`.
 
-{% endcomment %}
+-->{%- endcomment %}
 <div>
-	{% assign message = 'Social Media & Resources' %}
-	{% if site.data.text-for.tSocialMediaResources %}{% assign message = site.data.text-for.tSocialMediaResources %}{% endif %}
+{%- assign message = 'Social Media & Resources' -%}
+{%- if site.data.text-for.tSocialMediaResources -%}
+	{%- assign message = site.data.text-for.tSocialMediaResources -%}
+{%- endif %}
 	<h1>{{ message }}:</h1>
-	{% if site.github_username %}
-		<div>{% include widgets/social-media-res/icon-github.html username=site.github_username %}</div>
-	{% endif %}
-	{% if site.twitter_username %}
-		<div>{% include widgets/social-media-res/icon-twitter.html username=site.twitter_username %}</div>
-	{% endif %}
+{%- if site.github_username %}
+		<div>
+	{% include widgets/social-media-res/icon-github.html username=site.github_username %}
+		</div>
+{%- endif -%}
+{%- if site.twitter_username %}
+		<div>
+	{% include widgets/social-media-res/icon-twitter.html username=site.twitter_username %}
+		</div>
+{%- endif %}
 </div>
+<!-- end of include social-media.html -->

data/_includes/widgets/subscribe.html

@@ -1,13 +1,18 @@
-{% comment %}
+
+<!-- include subscribe.html -->
+{%- comment -%}<!--
 
 Usage:
 
 Configure the text for the header message in "_data/text-for.yml" for the item `tSubscribe`.
 
-{% endcomment %}
+-->{%- endcomment %}
 <div>
-	{% assign subscribe = 'Subscribe' %}
-	{% if site.data.text-for.tSubscribe %}{% assign subscribe = site.data.text-for.tSubscribe %}{% endif %}
+{%- assign subscribe = 'Subscribe' -%}
+{%- if site.data.text-for.tSubscribe -%}
+	{%- assign subscribe = site.data.text-for.tSubscribe -%}
+{%- endif %}
 	<h1>{{ subscribe }}:</h1>
 	<p class="rss-subscribe"><a href="{{ "/feed.xml" | relative_url }}">via RSS</a></p>
 </div>
+<!-- end of include subscribe.html -->

data/_includes/widgets/youtube-player.html

@@ -1,4 +1,6 @@
-{% comment %}
+
+<!-- include youtube-player.html for {{include.video}} -->
+{%- comment -%}<!--
 
 Purpose:
 
@@ -7,12 +9,10 @@ To include a youtube video player in HD format in a column. The player will size
 
 Usage:
 
-	{% include youtube-hd-player.html
-		video = "Identifier of the video"
-	%}
+	{%- include widgets/youtube-player.html video='Identifier of the video' -%}
 
 
-Also needs the following CSS (written in SASS, included in `_sass/_widget-support.scss`):
+Also needs the following CSS (written in SASS, included in `_sass/_widgets.scss`):
 
 .scaling-iframe-wrapper-hd {
 	position: relative;
@@ -33,6 +33,6 @@ Also needs the following CSS (written in SASS, included in `_sass/_widget-suppor
 	}
 }
 
-{% endcomment %}
-
-<div class="scaling-iframe-wrapper-hd"><iframe src="https://www.youtube.com/embed/{{ include.video }}"></iframe></div>
+-->{%- endcomment %}
+<div class="scaling-iframe-wrapper-hd"><iframe src="https://www.youtube.com/embed/{{ include.video }}"></iframe></div>
+<!-- end of include youtube-player.html -->

data/_layouts/banner-layout.html

@@ -0,0 +1 @@
+{% include banner-area.html %}

data/_layouts/category-page.html

@@ -1,51 +1,51 @@
 ---
 layout: default
 ---
+<!-- Start of generated category page -->
 <article class="page">
-
-	{% assign category = 'Category' %}
-	{% if site.data.text-for.tCategory %}{% assign category = site.data.text-for.tCategory %}{% endif %}
+{%- assign category = 'Category' -%}
+{%- if site.data.text-for.tCategory -%}{%- assign category = site.data.text-for.tCategory -%}{%- endif %}
 	<header class="page-header">
 		<h1 class="page-title">{{ category }}: {{ page.title | capitalize }}</h1>
 	</header>
-
-	{% assign found = false %}
-	{% for post in site.posts %}
-		{% if post.categories %}
-			{% for cat in post.categories %}
-				{% if cat == page.title %}
-					{% assign found = true %}
-
+{%- assign found = false -%}
+{%- for post in site.posts -%}
+	{%- if post.categories -%}
+		{%- for cat in post.categories -%}
+			{%- if cat == page.title -%}
+				{%- assign found = true %}
 					<div class="category-post">
 						<h2 class="cp-header">
 							<span class="cph-title">{{ post.title }}</span>
 							<span class="post-meta">{{ post.date | date: "%F" }}</span>
 						</h2>
-
-						{% if post.tags.size > 0 %}
-						{% assign tags = 'Tags' %}
-						{% if site.data.text-for.tTags %}{% assign tags = site.data.text-for.tTags %}{% endif %}
+				{%- if post.tags.size > 0 -%}
+					{%- assign tags = 'Tags' -%}
+					{%- if site.data.text-for.tTags -%}
+						{%- assign tags = site.data.text-for.tTags -%}
+					{%- endif %}
 						<p class="post-tags">{{ tags }}: <span>
-							{% for tag in post.tags %}
-							{{ tag }}{% if tag != post.tags.last %}, {% endif %}
-							{% endfor %}</span>
+					{%- for tag in post.tags -%}
+						{{ tag }}{%- if tag != post.tags.last -%}, {%- endif -%}
+					{%- endfor -%}</span>
 						</p>
-						{% endif %}
-
-						{% assign more = 'more' %}
-						{% if site.data.text-for.tMore %}{% assign more = site.data.text-for.tMore %}{% endif %}
+				{%- endif -%}
+				{%- assign more = 'more' -%}
+				{%- if site.data.text-for.tMore -%}
+					{%- assign more = site.data.text-for.tMore -%}
+				{%- endif %}
 						<p>{{ post.excerpt | remove: '<p>' | remove: '</p>' }}<a href="{{ post.url }}">{{ more }}...</a></p>
 					</div>
-
-				{% endif %}
-			{% endfor %}
-		{% endif %}
-	{% endfor %}
-
-	{% if found == false %}
-		{% assign message = 'No blogposts found for this category' %}
-		{% if site.data.text-for.tNoBlogpostFound %}{% assign message = site.data.text-for.tNoBlogpostFound %}{% endif %}
+			{%- endif -%}
+		{%- endfor -%}
+	{%- endif -%}
+{%- endfor -%}
+{%- if found == false -%}
+	{%- assign message = 'No blogposts found for this category' -%}
+	{%- if site.data.text-for.tNoBlogpostFound -%}
+		{%- assign message = site.data.text-for.tNoBlogpostFound -%}
+	{%- endif %}
 		<div><p style="text-align: center;">{{ message }}</p></div>
-	{% endif %}
-
+{%- endif %}
 </article>
+<!-- End of generated category page -->

data/_layouts/content-blocks.html

@@ -2,7 +2,5 @@
 layout: default
 ---
 <div class="cblock-page">
-
-	{% include cblock-row.html title="Content Blocks" cblocks=site.data.cblocks %}
-	
+{% include cblock-row.html title="Content Blocks" cblocks=site.data.cblocks %}
 </div>

data/_layouts/default.html

@@ -1,78 +1,152 @@
 <!DOCTYPE html>
-{% if page.secondary-column %}{% if page.secondary-column == 'left' %}{% assign secondary-column = 'left' %}{% endif %}{% if page.secondary-column == 'right' %}{% assign secondary-column = 'right' %}{% endif %}{% else %}{% if site.data.setup.secondary-column == 'left' %}{% assign secondary-column = 'left' %}{% endif %}{% if site.data.setup.secondary-column == 'right' %}{% assign secondary-column = 'right' %}{% endif %}{% endif %}
-{% if page.secondary-column-content %}{% assign secondary-column-content = page.secondary-column-content %}{% else %}{% assign secondary-column-content = 'secondary-column.html' %}{% endif %}
-{% if page.tertiary-column %}{% if page.tertiary-column == 'present' %}{% assign tertiary-column = 'present' %}{% endif %}{% else %}{% if site.data.setup.tertiary-column == 'present' %}{% assign tertiary-column = 'present' %}{% endif %}{% endif %}
-{% if page.tertiary-column-content %}{% assign tertiary-column-content = page.tertiary-column-content %}{% else %}{% assign tertiary-column-content = 'tertiary-column.html' %}{% endif %}
-{% if page.navbanner-position %}{% assign navbanner-position = page.navbanner-position %}{% else %}{% assign navbanner-position = site.data.setup.navbanner-position %}{% endif %}
-<html>
 
+{%- comment -%}<!-- Determine placing of secondary column -->{%- endcomment -%}
+
+{%- if page.secondary-column -%}
+	{%- if page.secondary-column == 'left' -%}
+		{%- assign secondary-column = 'left' -%}
+	{%- endif -%}
+	{%- if page.secondary-column == 'right' -%}
+		{%- assign secondary-column = 'right' -%}
+	{%- endif -%}
+{%- else -%}
+	{%- if site.data.setup.secondary-column == 'left' -%}
+		{%- assign secondary-column = 'left' -%}
+	{%- endif -%}
+	{%- if site.data.setup.secondary-column == 'right' -%}
+		{%- assign secondary-column = 'right' -%}
+	{%- endif -%}
+{%- endif -%}
+
+
+{%- comment -%}<!-- Determine content source of secondary column -->{%- endcomment -%}
+
+{%- if page.secondary-column-content -%}
+	{%- assign secondary-column-content = page.secondary-column-content -%}
+{%- else -%}
+	{%- assign secondary-column-content = 'secondary-column.html' -%}
+{%- endif -%}
+
+
+{%- comment -%}<!-- Determine placing of tertiary column -->{%- endcomment -%}
+
+{%- if page.tertiary-column -%}
+	{%- if page.tertiary-column == 'present' -%}
+		{%- assign tertiary-column = 'present' -%}
+	{%- endif -%}
+{%- else -%}
+	{%- if site.data.setup.tertiary-column == 'present' -%}
+		{%- assign tertiary-column = 'present' -%}
+	{%- endif -%}
+{%- endif -%}
+
+
+{%- comment -%}<!-- Determine content source of secondary column -->{%- endcomment -%}
+
+{%- if page.tertiary-column-content -%}
+	{%- assign tertiary-column-content = page.tertiary-column-content -%}
+{%- else -%}
+	{%- assign tertiary-column-content = 'tertiary-column.html' -%}
+{%- endif -%}
+
+
+{%- comment -%}<!-- Determine placing of banner-area -->{%- endcomment -%}
+
+{%- if page.banner-position -%}
+	{%- assign banner-position = page.banner-position -%}
+{%- elsif page.navbanner-position -%}
+	{%- assign banner-position = page.navbanner-position -%}
+{%- else -%}
+	{%- assign banner-position = site.data.setup.banner-position -%}
+{%- endif %}
+<html>
 	{% include head.html %}
 	
   	<body class="body-panel">
   	
-  		{% if navbanner-position == 'top' %}
-  			{% if site.data.setup.use-separate-navbanner %}
-  				<div id="navFrame" class="navbanner-panel"><script>$("#navFrame").load("/navbanner.html");</script></div>
-  			{% else %}
-  				<div class="navbanner-panel">{% include navbanner.html %}</div>
-  			{% endif %}
-  		{% endif %}
+	{%- if banner-position == 'top' or banner-position == 'top-fixed' -%}
+		{%- if site.data.setup.use-separate-banner-menubar-file %}
+  		<div id="navFrame"><script>$("#navFrame").load("/banner-area.html");</script></div>
+		{%- else -%}
+			{%- include banner-area.html -%}
+		{%- endif -%}
+	{%- endif %}
 
 		<div class="column-panel">
 
-			{% if secondary-column == 'left' %}
+	{%- if secondary-column == 'left' %}
 			<div class="secondary-column">
-				<div class="secondary-column-content">{% include {{ secondary-column-content }} %}</div>
-				{% if tertiary-column == 'present' %}	
-					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
-				{% endif %}
+				<div class="secondary-column-content">
+		{%- if site.data.setup.drop-down-menu -%}{%- else -%}
+			{%- include vertical-menu.html label-modifier="a" -%}
+		{%- endif %}
+		{% include {{ secondary-column-content }} label-modifier="a" %}
+				</div>
+		{%- if tertiary-column == 'present' %}	
+				<div class="tertiary-column-content">
+			{% include {{ tertiary-column-content }} %}
+				</div>
+		{%- endif %}
 			</div>
-			<div class="secondary-divider"></div>
-			{% else %}
-				{% if tertiary-column == 'present' %}
-				<div class="tertiary-column">
-					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
+			<div class="secondary-separator"></div>
+	{%- else -%}
+		{%- if tertiary-column == 'present' %}
+			<div class="tertiary-column">
+				<div class="tertiary-column-content">
+			{% include {{ tertiary-column-content }} %}
 				</div>
-				<div class="tertiary-divider"></div>
-				{% endif %}			
-			{% endif %}
-
+			</div>
+			<div class="tertiary-separator"></div>
+		{%- endif -%}			
+	{%- endif %}
 
 			<div class="primary-column">
-			  	{% if navbanner-position == 'main' %}
-  					{% if site.data.setup.use-separate-navbanner %}
-  						<div id="navFrame" class="navbanner-panel"><script>$("#navFrame").load("/navbanner.html");</script></div>
-  					{% else %}
-  						<div class="navbanner-panel">{% include navbanner.html %}</div>
-  					{% endif %}
-  				{% endif %}
-				<main>{{ content }}</main>
+  	{%- if banner-position == 'main' -%}
+		{%- if site.data.setup.use-separate-banner-menubar-file %}
+  				<div id="navFrame"><script>$("#navFrame").load("/banner-area.html");</script></div>
+		{%- else -%}
+			{% include banner-area.html %}
+		{%- endif -%}
+	{%- endif %}
+				<main>
+
+<!-- Start of main content -->
+{{ content }}
+<!-- End of main content -->
+
+				</main>
 			</div>
 			
-			
-			{% if secondary-column == 'right' %}
-			<div class="secondary-divider"></div>			
+	{%- if secondary-column == 'right' %}
+			<div class="secondary-separator"></div>			
 			<div class="secondary-column">
-				<div class="secondary-column-content">{% include {{ secondary-column-content }} %}</div>
-				{% if tertiary-column == 'present' %}	
-					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
-				{% endif %}
+				<div class="secondary-column-content">
+		{%- if site.data.setup.drop-down-menu -%}{%- else -%}
+			{% include vertical-menu.html label-modifier="c" %}
+		{%- endif -%}
+		{% include {{ secondary-column-content }} label-modifier="b" %}
+				</div>
+		{%- if tertiary-column == 'present' %}	
+				<div class="tertiary-column-content">
+			{%- include {{ tertiary-column-content }} %}
+				</div>
+		{%- endif -%}
 			</div>
-			{% else %}
-			   {% if tertiary-column == 'present' %}
-				<div class="tertiary-divider"></div>
-				<div class="tertiary-column">
-					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
+	{%- else -%}
+	   {%- if tertiary-column == 'present' %}
+			<div class="tertiary-separator"></div>
+			<div class="tertiary-column">
+				<div class="tertiary-column-content">
+			{% include {{ tertiary-column-content }} %}
 				</div>
-				{% endif %}
-			{% endif %}
+			</div>
+		{%- endif -%}
+	{%- endif %}
 
 		</div>
-
-		<div class="footer-divider"></div>
-
-		<div class="footer-panel">{% include footer.html %}</div>
-
+		<div class="footer-separator"></div>
+		<div class="footer-panel">
+	{% include footer.html %}
+		</div>
   	</body>
-
 </html>