From: Raivis Vitols <raivis-vitols@users.noreply.github.com>
Date: Fri, 18 Aug 2017 14:38:36 +0000 (+0300)
Subject: Merge pull request #13 from raivis-vitols/development
X-Git-Tag: v5.0.0~8
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=b261533f691e4ef722b14f94454eb72cef4d630b;hp=0ef21f45ce781141d1f86a68199c11f388dd32e2;p=ghost-theme-willow.git

Merge pull request #13 from raivis-vitols/development

Tweaking theme to be compatible with 1.X versions of Ghost
---

diff --git a/README.md b/README.md
index e88f8d6..24aff05 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,12 @@
-# Willow Ghost Theme 4.0
+# Willow Ghost Theme 4.1
 
 Personal, responsive, minimalist and open-source theme for Ghost blogging platform. Lightweight - only 3KB of CSS and 820B of JavaScript. No jQuery, vanilla JS only. Starting version 2.0 theme is built with SASS in BEM style using ITCSS (http://itcss.io/) architecture.
 
 ![Willow Ghost Theme](http://i.imgur.com/a8WfkoS.png)
 
+## Theme Compatibility
+Theme is fully compatible with Ghost 1.X versions. The 0.X version compatible theme can be found in "version-0.X" branch.
+
 ## Theme Demo
 
 ~~This theme is currently being used on my personal blog - [https://raivis.com/](https://raivis.com/).~~ Sorry, demo is no longer available - check the screenshots below or see this page for more detailed theme overview - [https://raivis.com/willow-free-responsive-minimalist-ghost-blog-theme/](https://raivis.com/willow-free-responsive-minimalist-ghost-blog-theme/)
diff --git a/assets/img/favicon.ico b/assets/img/favicon.ico
deleted file mode 100644
index 6da2722..0000000
Binary files a/assets/img/favicon.ico and /dev/null differ
diff --git a/author.hbs b/author.hbs
index 23094b9..e1d2884 100644
--- a/author.hbs
+++ b/author.hbs
@@ -1,9 +1,9 @@
 {{!< default}}
 {{#author}}
     <div class="c-author-page">
-        {{#if image}}
+        {{#if profile_image}}
             <div class="c-author-page__image">
-                <img class="c-author-page__image__src" src="{{image}}" alt="{{name}}'s Picture"/>
+                <img class="c-author-page__image__src" src="{{img_url profile_image}}" alt="{{name}}'s Picture"/>
             </div>
         {{/if}}
 
diff --git a/package.json b/package.json
index 235d302..e8083f2 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,17 @@
 {
   "name": "Willow",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "main": "Gruntfile.js",
   "author": {
     "name": "Raivis Vitols",
     "url": "https://raivis.com"
   },
+  "engines": {
+    "ghost": ">=1.0.0"
+  },
+  "config": {
+    "posts_per_page": 9
+  },
   "devDependencies": {
     "grunt": "~1.0.1",
     "grunt-sass": "~1.1.0",
diff --git a/partials/head.hbs b/partials/head.hbs
index 982127e..d93d859 100644
--- a/partials/head.hbs
+++ b/partials/head.hbs
@@ -2,11 +2,7 @@
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 
 <title>{{meta_title}}</title>
-<meta name="description" content="{{meta_description}}" />
 <meta name="viewport" content="width=device-width,initial-scale=1.0" />
 
-<link rel="shortcut icon" href="{{asset "img/favicon.ico"}}" />
-<link rel="apple-touch-icon" href="{{asset "img/favicon.ico"}}" />
-
 <link rel="stylesheet" type="text/css" href="{{asset "css/styles.css"}}" />
 <link href="https://fonts.googleapis.com/css?family=Merriweather:400,700,700italic,400italic" rel="stylesheet">
diff --git a/partials/post-list.hbs b/partials/post-list.hbs
index d37bb83..7b41ed3 100644
--- a/partials/post-list.hbs
+++ b/partials/post-list.hbs
@@ -2,7 +2,7 @@
     {{#foreach posts}}
         <article class="c-post-list__item {{post_class}}">
             <a class="c-post-list__image" href="{{url}}" title="{{title}}">
-                <img class="c-post-list__image__img" src="{{image}}" alt="{{title}}"/>
+                <img class="c-post-list__image__img" src="{{img_url feature_image}}" alt="{{title}}"/>
             </a>
 
             <h2 class="c-post-list__title">
diff --git a/partials/prev-next.hbs b/partials/prev-next.hbs
index 727761a..e873edf 100644
--- a/partials/prev-next.hbs
+++ b/partials/prev-next.hbs
@@ -2,7 +2,7 @@
         {{#next_post}}
             <article class="c-post-view-prev-next__item {{post_class}}">
                 <a class="c-post-view-prev-next__image" href="{{url}}" title="{{title}}">
-                    <img class="c-post-view-prev-next__image__img" src="{{image}}" alt="{{title}}"/>
+                    <img class="c-post-view-prev-next__image__img" src="{{img_url feature_image}}" alt="{{title}}"/>
                     <span class="c-post-view-prev-next__image__label c-post-view-prev-next__image__label--next">
                         Next Post
                     </span>
@@ -25,7 +25,7 @@
         {{#prev_post}}
             <article class="c-post-view-prev-next__item {{post_class}}">
                 <a class="c-post-view-prev-next__image" href="{{url}}" title="{{title}}">
-                    <img class="c-post-view-prev-next__image__img" src="{{image}}" alt="{{title}}"/>
+                    <img class="c-post-view-prev-next__image__img" src="{{img_url feature_image}}" alt="{{title}}"/>
                     <span class="c-post-view-prev-next__image__label c-post-view-prev-next__image__label--previous">
                         Previous Post
                     </span>
diff --git a/partials/sidebar.hbs b/partials/sidebar.hbs
index f8ee847..d5d8d12 100644
--- a/partials/sidebar.hbs
+++ b/partials/sidebar.hbs
@@ -1,6 +1,6 @@
 <div id="site-sidebar" class="c-site-sidebar">
     {{! Sidebar header with blog cover and logo images }}
-    <div class="c-sidebar-header" style="background-image: url({{@blog.cover}})">
+    <div class="c-sidebar-header" style="background-image: url({{@blog.cover_image}})">
         <a class="c-sidebar-header__link" href="{{@blog.url}}" title="{{@blog.title}}">
             <img class="c-sidebar-header__image" src="{{@blog.logo}}" alt="{{@blog.title}}">
         </a>