Merge pull request #10 from SimonMueller/develop

Release v1.0.1
SimonMueller · Dec 30, 2017 · 2077886 · 2077886
2 parents 45fd328 + 4cf1c44
commit 2077886
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,3 +3,15 @@
 
 1. [](#new)
     * Initial release
+
+# v1.0.1
+## 30.12.2017
+
+1. [](#new)
+    * Added config for collection head
+2. [](#improved)
+    * Improved article header
+3. [](#bugfix)
+    * Breadcrumb overflow handling (wrap)
+    * Correct padding of footer widget
+    * Fix display of publish date
diff --git a/README.md b/README.md
@@ -78,6 +78,18 @@ Manually updating pluspunkt is pretty simple. Here is what you will need to do t
   * Modular default view template
   * Modular form view template
 
+### General Collections
+
+General collections can have a collection head (the collection page content) and can list the contained items.
+
+```yaml
+collection_head:
+  enabled: true
+  list_items: true
+```
+
+> Note: The Blog page is just an alias of a general collection page for compatibility.
+
 ### Organization Address
 
 The theme configuration allows you to set theme wide organization address data. This can be used for example in the contact page to generate an address.
@@ -152,6 +164,10 @@ person:
     email: [email protected]
 ```
 
+### About Page
+
+The about page has a collection head and lists the person pages with address and portrait.
+
 ### Item Page
 
 The item page can show a resource download (e.g. link to pdf). The resource can be uploaded as page media and selected afterwards.

diff --git a/_demo/pages/02.collections/collection.md b/_demo/pages/02.collections/collection.md
@@ -6,7 +6,9 @@ intro:
   text_enabled: true
   text: General collection
 
-collection_head: true
+collection_head:
+  enabled: true
+  list_items: true
 
 content:
   items: '@self.children'

diff --git a/_demo/pages/04.about/about.md b/_demo/pages/04.about/about.md
@@ -6,6 +6,9 @@ intro:
   text_enabled: true
   text: About us
 
+collection_head:
+  enabled: true
+
 content:
   items: '@self.children'
   order:

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: pluspunkt
-version: 1.0.0
+version: 1.0.1
 description: A simple, responsive and modern Grav theme built with Kube
 author:
   name: Simon Müller

diff --git a/css/master.css b/css/master.css
@@ -2525,6 +2525,8 @@ html, body {
 
 article header {
   margin-bottom: 16px; }
+  article header h1, article header h2, article header h3, article header h4, article header h5, article header h6 {
+    margin-bottom: 0; }
 
 .content {
   margin: auto;
@@ -2905,17 +2907,21 @@ footer {
     color: #313439; }
 
 .widget {
-  padding-left: 20px; }
+  padding: 0 20px; }
   @media (min-width: 768px) {
     .widget {
-      padding-left: 0; } }
+      padding: 0; } }
   .widget .title {
     font-weight: bold; }
 
 .centered {
   margin-left: auto;
   margin-right: auto; }
 
+.breadcrumbs ul {
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap; }
+
 /*
   Hamburger Menu
 */

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grav-theme-pluspunkt",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A simple, responsive and modern Grav theme built with Kube",
   "keywords": [
     "pluspunkt",

diff --git a/scss/pluspunkt.scss b/scss/pluspunkt.scss
@@ -30,6 +30,7 @@
 @import 'theme/footer';
 @import 'theme/utils';
 @import 'theme/form';
+@import 'theme/breadcrumbs';
 
 /*
   Hamburger Menu

diff --git a/scss/theme/_breadcrumbs.scss b/scss/theme/_breadcrumbs.scss
@@ -0,0 +1,5 @@
+.breadcrumbs {
+  & ul {
+    @include flex-items-wrap;
+  }
+}
diff --git a/scss/theme/_core.scss b/scss/theme/_core.scss
@@ -27,6 +27,10 @@ html, body {
 article{
   header{
     margin-bottom: $heading-margin-bottom;
+
+    h1, h2, h3, h4, h5, h6{
+      margin-bottom: 0;
+    }
   }
 }
 

diff --git a/scss/theme/_footer.scss b/scss/theme/_footer.scss
@@ -8,10 +8,10 @@ footer{
 }
 
 .widget{
-  padding-left: $base-line-small;
+  padding: 0 $base-line-small;
 
   @media (min-width: $sm) {
-    padding-left: 0;
+    padding: 0;
   }
 
   .title{

diff --git a/templates/about.html.twig b/templates/about.html.twig
@@ -4,9 +4,11 @@
 
 {% block content %}
   {% block collection_head %}
-    <section class="container">
-      {% include 'partials/collection_head.html.twig' with {'list_items': false} %}
-    </section>
+    {% if header.collection_head.enabled|defined(false) %}
+      <section class="container">
+        {% include 'partials/collection_head.html.twig' with {'list_items': header.collection_head.list_items|defined(false)} %}
+      </section>
+    {% endif %}
   {% endblock %}
 
   {% block collection %}

diff --git a/templates/collection.html.twig b/templates/collection.html.twig
@@ -4,9 +4,9 @@
 
 {% block content %}
   {% block collection_head %}
-    {% if header.collection_head %}
+    {% if header.collection_head.enabled|defined(false) %}
       <section class="container">
-        {% include 'partials/collection_head.html.twig' with {'list_items': true} %}
+        {% include 'partials/collection_head.html.twig' with {'list_items': header.collection_head.list_items|defined(false)} %}
       </section>
     {% endif %}
   {% endblock %}

diff --git a/templates/item.html.twig b/templates/item.html.twig
@@ -9,12 +9,12 @@
         <header>
           <h1 class="hyphenate">
             {{ page.title }}
-          </br>
-            {% include 'partials/taxonomies.html.twig' %}
           </h1>
 
-          {% if page.publish_date %}
-            <span class="label default"><time>{{ page.publish_date|date() }}</time></span>
+          {% include 'partials/taxonomies.html.twig' %}
+
+          {% if page.header.publish_date %}
+            <span class="label default"><time>{{ page.header.publish_date|date() }}</time></span>
           {% endif %}
         </header>
 

diff --git a/templates/partials/about_item.html.twig b/templates/partials/about_item.html.twig
@@ -5,18 +5,19 @@
 <div id="{{ page.slug }}" class="card ripple">
   <article  class="content">
     <div class="row gutters">
-      <div class="col col-4">
-        <header>
-          {% if show_portrait %}
-            <img src="{{ page.media[page.header.person.portrait.url].url }}" alt="{{ page.header.person.portrait.alt }}" class="portrait centered grayscale" />
-          {% endif %}
+      <header class="col col-4">
+        {% if show_portrait %}
+          <img src="{{ page.media[page.header.person.portrait.url].url }}" alt="{{ page.header.person.portrait.alt }}" class="portrait centered grayscale" />
+        {% endif %}
+
+        <div class="text-center">
           <h3 class="text-center donthyphenate">
             <a href="{{ page.url }}">{{page.title}}</a>
             </br>
-            {% include 'partials/taxonomies.html.twig' %}
           </h3>
-        </header>
-      </div>
+          {% include 'partials/taxonomies.html.twig' %}
+        </div>
+      </header>
       <div class="col col-8">
         {% if show_summary %}
           {{ page.summary }}

diff --git a/templates/partials/collection_item.html.twig b/templates/partials/collection_item.html.twig
@@ -6,12 +6,12 @@
     <header>
       <h3>
         <a href="{{ page.url }}">{{ page.title }}</a>
-        </br>
-        {% include 'partials/taxonomies.html.twig' %}
       </h3>
 
-      {% if page.publish_date %}
-        <span class="label default"><time>{{ page.publish_date|date() }}</time></span>
+      {% include 'partials/taxonomies.html.twig' %}
+
+      {% if page.header.publish_date %}
+        <span class="label default"><time>{{ page.header.publish_date|date() }}</time></span>
       {% endif %}
     </header>
 

diff --git a/templates/person.html.twig b/templates/person.html.twig
@@ -11,12 +11,12 @@
           {% if show_portrait %}
             <img src="{{ page.media[header.person.portrait.url].url }}" alt="{{ header.person.portrait.alt }}" class="portrait centered grayscale" />
           {% endif %}
+
           <div class="text-center">
             <h1 class="donthyphenate">
               {{ page.title }}
-              </br>
-              {% include 'partials/taxonomies.html.twig' %}
             </h1>
+            {% include 'partials/taxonomies.html.twig' %}
           </div>
         </header>