Deploy 0.4.0

robbinjohansson · Mar 1, 2018 · badc6e1 · badc6e1
1 parent 0b30239
commit badc6e1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # v0.4.0
-## TBD
+## 03/01/2018
 
 1. [](#new)
     * Add favicon

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -7,7 +7,7 @@ author:
   email: robbinfellow@gmail.com
   url: https://github.com/robbinfellow/
 homepage: https://github.com/robbinfellow/haywire-grav#readme
-keywords: haywire, boilerplate, starter-theme, vuejs, laravel-mix, bulma
+keywords: haywire, grav, boilerplate, starter-theme, vuejs, laravel-mix, bulma
 bugs: https://github.com/robbinfellow/haywire-grav/issues
 docs: https://github.com/robbinfellow/haywire-grav#readme
 license: MIT

diff --git a/resources/js/app.js b/resources/js/app.js
@@ -4,6 +4,7 @@ import "babel-polyfill";
 
 // Load all of this project's JavaScript dependencies including Vue
 require('./bootstrap');
+
 window.Vue = require('vue');
 
 /**

diff --git a/templates/blog.html.twig b/templates/blog.html.twig
@@ -24,19 +24,23 @@
                                 <strong class="title is-size-5">
                                     {{ post.title }}
                                 </strong>
-                                {{ post.header.intro|truncate(120)|markdown }}
+                                {% if post.header.intro %}
+                                    {{ post.header.intro|truncate(120)|markdown }}
+                                {% else %}
+                                    {{ post.summary(120) }}
+                                {% endif %}
                                 <small>
                                     {{ post.header.publish_date|nicetime() }}
                                 </small>
                             </div>
                         </div>
 
                         {% if post.header.featured_image %}
-                        <div class="media-right">
-                            <figure class="image">
-                                <img src="{{ post.url }}/{{ post.header.featured_image }}?cropResize=160,120" alt="{{ post.title }}">
-                            </figure>
-                        </div>
+                            <div class="media-right">
+                                <figure class="image">
+                                    <img src="{{ post.url }}/{{ post.header.featured_image }}?cropResize=160,120" alt="{{ post.title }}">
+                                </figure>
+                            </div>
                         {% endif %}
 
                     </article>

diff --git a/templates/item.html.twig b/templates/item.html.twig
@@ -5,33 +5,33 @@
     <div class="columns is-centered">
         <div class="column is-7">
 
-        <div class="content">
-            <h1>
-                {{ page.title }}
-            </h1>
-
-            {% if page.header.intro %}
-            <div class="is-size-5">
-                {{ page.header.intro|markdown }}
+            <div class="content">
+                <h1>
+                    {{ page.title }}
+                </h1>
+
+                {% if page.header.intro %}
+                    <div class="is-size-5">
+                        {{ page.header.intro|markdown }}
+                    </div>
+                {% endif %}
+
+                {% if page.header.featured_image %}
+                    <figure class="image is-4by3" style="margin-left: 0; margin-right: 0;">
+                        <img src="{{ page.url }}/{{ page.header.featured_image }}?cropResize=768,576" alt="{{ page.title }}">
+                    </figure>
+                {% endif %}
+
+                {{ page.content }}
             </div>
-            {% endif %}
-
-            {% if page.header.featured_image %}
-            <figure class="image is-4by3" style="margin-left: 0; margin-right: 0;">
-                <img src="{{ page.url }}/{{ page.header.featured_image }}?cropResize=768,576" alt="{{ page.title }}">
-            </figure>
-            {% endif %}
-
-            {{ page.content }}
-         </div>
 
             {% if page.header.taxonomy.tag %}
                 <div class="tags">
-                {% for tag in page.header.taxonomy.tag %}
-                    <span class="tag">
-                        {{ tag }}
-                    </span>
-                {% endfor %}
+                    {% for tag in page.header.taxonomy.tag %}
+                        <span class="tag">
+                            {{ tag }}
+                        </span>
+                    {% endfor %}
                 </div>
             {% endif %}