change {{@blog}} helper to {{@site}} and {{lang}} to {{@site.lang}}

zutrinken · Apr 13, 2019 · dd06323 · dd06323
1 parent 837c075
commit dd06323
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 39 deletions.
diff --git a/author.hbs b/author.hbs
@@ -1,19 +1,19 @@
 {{!< default}}
 
 {{#author}}
-<header id="blog-header"{{#if cover_image}} class="has-cover"{{else}}{{#if @blog.cover_image}} class="has-cover"{{/if}}{{/if}}>
+<header id="blog-header"{{#if cover_image}} class="has-cover"{{else}}{{#if @site.cover_image}} class="has-cover"{{/if}}{{/if}}>
 	<div class="inner">
 		<nav id="navigation">
-			{{#if @blog.logo}}
+			{{#if @site.logo}}
 			<span class="blog-logo">
-				<a href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{t "Blog Logo"}}" /></a>
+				<a href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{t "Blog Logo"}}" /></a>
 			</span>
 			{{else}}
 			<span id="home-button" class="nav-button">
-				<a class="home-button" href="{{@blog.url}}" title="{{t "Home"}}"><i class="ic ic-arrow-left"></i> {{t "Home"}}</a>
+				<a class="home-button" href="{{@site.url}}" title="{{t "Home"}}"><i class="ic ic-arrow-left"></i> {{t "Home"}}</a>
 			</span>
 			{{/if}}
-			{{#if @blog.navigation}}
+			{{#if @site.navigation}}
 			<span id="menu-button" class="nav-button">
 				<a class="menu-button"><i class="ic ic-menu"></i> {{t "Menu"}}</a>
 			</span>
@@ -22,14 +22,14 @@
 		{{#if cover_image}}
 		<div class="blog-cover cover" style="background-image: url('{{img_url cover_image}}');"></div>
 		{{else}}
-		{{#if @blog.cover_image}}
-		<div class="blog-cover cover" style="background-image: url('{{img_url @blog.cover}}');"></div>
+		{{#if @site.cover_image}}
+		<div class="blog-cover cover" style="background-image: url('{{img_url @site.cover}}');"></div>
 		{{/if}}
 		{{/if}}
 	</div>
 </header>
 
-<section id="blog-author"{{#if cover_image}} class="has-cover"{{else}}{{#if @blog.cover_image}} class="has-cover"{{/if}}{{/if}}>
+<section id="blog-author"{{#if cover_image}} class="has-cover"{{else}}{{#if @site.cover_image}} class="has-cover"{{/if}}{{/if}}>
 	<div class="inner">
 
 		<aside class="post-author">

diff --git a/default.hbs b/default.hbs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{lang}}">
+<html lang="{{@site.lang}}">
 <head>
 	<meta charset="utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

diff --git a/index.hbs b/index.hbs
@@ -1,24 +1,24 @@
 {{!< default}}
-<header id="blog-header"{{#if @blog.cover_image}} class="has-cover"{{/if}}>
+<header id="blog-header"{{#if @site.cover_image}} class="has-cover"{{/if}}>
 	<div class="inner">
 		<nav id="navigation">
-			{{#if @blog.logo}}
+			{{#if @site.logo}}
 			<span class="blog-logo">
-				<a href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{t "Blog Logo"}}" /></a>
+				<a href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{t "Blog Logo"}}" /></a>
 			</span>
 			{{/if}}
-			{{#if @blog.navigation}}
+			{{#if @site.navigation}}
 			<span id="menu-button" class="nav-button">
 				<a class="menu-button"><i class="ic ic-menu"></i> {{t "Menu"}}</a>
 			</span>
 			{{/if}}
 		</nav>
-		<h1 class="blog-name"><a href="{{@blog.url}}">{{@blog.title}}</a></h1>
-		{{#if @blog.description}}
-		<span class="blog-description">{{@blog.description}}</span>
+		<h1 class="blog-name"><a href="{{@site.url}}">{{@site.title}}</a></h1>
+		{{#if @site.description}}
+		<span class="blog-description">{{@site.description}}</span>
 		{{/if}}
-		{{#if @blog.cover_image}}
-		<div class="blog-cover cover" style="background-image: url('{{img_url @blog.cover_image}}');"></div>
+		{{#if @site.cover_image}}
+		<div class="blog-cover cover" style="background-image: url('{{img_url @site.cover_image}}');"></div>
 		{{/if}}
 	</div>
 </header>

diff --git a/page.hbs b/page.hbs
@@ -5,16 +5,16 @@
 <header id="post-header"{{#if cover_image}} class="has-cover" {{/if}}>
 	<div class="inner">
 		<nav id="navigation">
-			{{#if @blog.logo}}
+			{{#if @site.logo}}
 			<span class="blog-logo">
-				<a href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{t "Blog Logo"}}" /></a>
+				<a href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{t "Blog Logo"}}" /></a>
 			</span>
 			{{else}}
 			<span id="home-button" class="nav-button">
-				<a class="home-button" href="{{@blog.url}}" title="{{t "Home"}}"><i class="ic ic-arrow-left"></i> Home</a>
+				<a class="home-button" href="{{@site.url}}" title="{{t "Home"}}"><i class="ic ic-arrow-left"></i> Home</a>
 			</span>
 			{{/if}}
-			{{#if @blog.navigation}}
+			{{#if @site.navigation}}
 			<span id="menu-button" class="nav-button">
 				<a class="menu-button"><i class="ic ic-menu"></i> {{t "Menu"}}</a>
 			</span>

diff --git a/partials/navigation.hbs b/partials/navigation.hbs
@@ -6,16 +6,16 @@
 			{{#foreach navigation}}
 			<li class="nav-{{slug}}{{#if current}} active{{/if}}" role="presentation"><a href="{{url absolute="true"}}">{{label}}</a></li>
 			{{/foreach}}
-			{{#if @blog.twitter}}
-			<li class="nav-twitter"><a href="{{twitter_url}}" title="{{@blog.twitter}}"><i class="ic ic-twitter"></i> Twitter</a></li>
+			{{#if @site.twitter}}
+			<li class="nav-twitter"><a href="{{twitter_url}}" title="{{@site.twitter}}"><i class="ic ic-twitter"></i> Twitter</a></li>
 			{{/if}}
-			{{#if @blog.facebook}}
-			<li class="nav-facebook"><a href="{{facebook_url}}" title="{{@blog.facebook}}"><i class="ic ic-facebook"></i> Facebook</a></li>
+			{{#if @site.facebook}}
+			<li class="nav-facebook"><a href="{{facebook_url}}" title="{{@site.facebook}}"><i class="ic ic-facebook"></i> Facebook</a></li>
 			{{/if}}
 			{{#if @labs.subscribers}}
-			<li class="nav-subscribe"><a href="{{@blog.url}}/subscribe/"><i class="ic ic-mail"></i> {{t "Subscribe"}}</a></li>
+			<li class="nav-subscribe"><a href="{{@site.url}}/subscribe/"><i class="ic ic-mail"></i> {{t "Subscribe"}}</a></li>
 			{{else}}
-			<li class="nav-rss"><a href="{{@blog.url}}/rss/"><i class="ic ic-rss"></i> {{t "Subscribe"}}</a></li>
+			<li class="nav-rss"><a href="{{@site.url}}/rss/"><i class="ic ic-rss"></i> {{t "Subscribe"}}</a></li>
 			{{/if}}
 		</ul>
 	</div>

diff --git a/post.hbs b/post.hbs
@@ -9,16 +9,16 @@
 <header id="post-header"{{#if feature_image}} class="has-cover" {{/if}}>
 	<div class="inner">
 		<nav id="navigation">
-			{{#if @blog.logo}}
+			{{#if @site.logo}}
 			<span class="blog-logo">
-				<a href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{t "Blog Logo"}}" /></a>
+				<a href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{t "Blog Logo"}}" /></a>
 			</span>
 			{{else}}
 			<span id="home-button" class="nav-button">
-				<a class="home-button" href="{{@blog.url}}" title="{{t "Home"}}"><i class="ic ic-arrow-left"></i> {{t "Home"}}</a>
+				<a class="home-button" href="{{@site.url}}" title="{{t "Home"}}"><i class="ic ic-arrow-left"></i> {{t "Home"}}</a>
 			</span>
 			{{/if}}
-			{{#if @blog.navigation}}
+			{{#if @site.navigation}}
 			<span id="menu-button" class="nav-button">
 				<a class="menu-button"><i class="ic ic-menu"></i> {{t "Menu"}}</a>
 			</span>

diff --git a/tag.hbs b/tag.hbs
@@ -1,18 +1,18 @@
 {{!< default}}
 
-<header id="blog-header"{{#if tag.feature_image}} class="has-cover"{{else}}{{#if @blog.cover_image}} class="has-cover"{{/if}}{{/if}}>
+<header id="blog-header"{{#if tag.feature_image}} class="has-cover"{{else}}{{#if @site.cover_image}} class="has-cover"{{/if}}{{/if}}>
 	<div class="inner">
 		<nav id="navigation">
-			{{#if @blog.logo}}
+			{{#if @site.logo}}
 			<span class="blog-logo">
-				<a href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{t "Blog Logo"}}" /></a>
+				<a href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{t "Blog Logo"}}" /></a>
 			</span>
 			{{else}}
 			<span id="home-button" class="nav-button">
-				<a class="home-button" href="{{@blog.url}}" title="Home"><i class="ic ic-arrow-left"></i> {{t "Home"}}</a>
+				<a class="home-button" href="{{@site.url}}" title="Home"><i class="ic ic-arrow-left"></i> {{t "Home"}}</a>
 			</span>
 			{{/if}}
-			{{#if @blog.navigation}}
+			{{#if @site.navigation}}
 			<span id="menu-button" class="nav-button">
 				<a class="menu-button"><i class="ic ic-menu"></i> {{t "Menu"}}</a>
 			</span>
@@ -29,8 +29,8 @@
 		{{#if tag.feature_image}}
 		<div class="blog-cover cover" style="background-image: url('{{img_url tag.feature_image}}');"></div>
 		{{else}}
-		{{#if @blog.cover_image}}
-		<div class="blog-cover cover" style="background-image: url('{{img_url @blog.cover_image}}');"></div>
+		{{#if @site.cover_image}}
+		<div class="blog-cover cover" style="background-image: url('{{img_url @site.cover_image}}');"></div>
 		{{/if}}
 		{{/if}}
 	</div>