Added support for the blog logo setting

6 files changed, 27 insertions, 3 deletions

diff --git a/assets/css/style.css b/assets/css/style.css
index 9bece8b..0a7b5b3 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -191,6 +191,11 @@ table {
     .site-title a:hover {
       background: #303030; }
 
+.site-logo {
+  display: block; }
+  .site-logo img {
+    margin: 0; }
+
 .site-nav {
   list-style: none;
   margin: 28px 0 10px; }
diff --git a/assets/sass/.sass-cache/7fbdc5420c4984c782d564cc39aea1da26db00a4/style.scssc b/assets/sass/.sass-cache/7fbdc5420c4984c782d564cc39aea1da26db00a4/style.scssc
index 5b02213..6ad489a 100644
--- a/assets/sass/.sass-cache/7fbdc5420c4984c782d564cc39aea1da26db00a4/style.scssc
+++ b/assets/sass/.sass-cache/7fbdc5420c4984c782d564cc39aea1da26db00a4/style.scssc
diff --git a/assets/sass/style.scss b/assets/sass/style.scss
index 0ef5e51..3415140 100644
--- a/assets/sass/style.scss
+++ b/assets/sass/style.scss
@@ -219,6 +219,11 @@ table {
         &:hover { background: $secondary; }
     }
 }
+.site-logo {
+    display: block;
+
+    img { margin: 0; }
+}
 
 .site-nav {
     list-style: none;
diff --git a/changelog.txt b/changelog.txt
index 83c54e9..e25a07e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,10 @@
 ------------------------------
+Ghostwriter Version 1.7.0
+------------------------------
+
+- Added support for the blog logo setting
+
+------------------------------
 Ghostwriter Version 1.6.0
 ------------------------------
 
diff --git a/default.hbs b/default.hbs
index 9e66475..b8c2eee 100644
--- a/default.hbs
+++ b/default.hbs
@@ -29,15 +29,23 @@
         <header class="site-header">
             <div class="container">
                 <div class="site-title-wrapper">
-                    <h1 class="site-title"><a class="js-ajax-link" title="{{@blog.title}}" href="{{@blog.url}}">{{@blog.title}}</a></h1>
+                    {{#if @blog.logo}}
+                        <a class="site-logo js-ajax-link" title="{{@blog.title}}" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{@blog.title}}" /></a>
+                    {{else}}
+                        <h1 class="site-title"><a class="js-ajax-link" title="{{@blog.title}}" href="{{@blog.url}}">{{@blog.title}}</a></h1>
 
-                    <a class="button-square" href="{{@blog.url}}/rss"><i class="fa fa-rss"></i></a>
+                        <a class="button-square" href="{{@blog.url}}/rss"><i class="fa fa-rss"></i></a>
+                    {{/if}}
                 </div>
 
                 <ul class="site-nav">
                     <li class="site-nav-item"><a class="js-ajax-link" href="{{@blog.url}}">Latest Post</a></li>
                     <li class="site-nav-item"><a class="js-ajax-link js-show-index" href="{{@blog.url}}">Browse Posts</a></li>
                     <li class="site-nav-item"><a class="js-ajax-link" href="{{@blog.url}}/about">About</a></li>
+
+                    {{#if @blog.logo}}
+                        <li class="site-nav-item"><a href="{{@blog.url}}/rss">RSS</a></li>
+                    {{/if}}
                 </ul>
             </div>
         </header>
diff --git a/package.json b/package.json
index e99af40..bf765ac 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,4 @@
 {
 	"name": "Ghostwriter",
-	"version": "1.6.0"
+	"version": "1.7.0"
 }
\ No newline at end of file