Merge pull request #48 from oAGoulart/updates

Fix layouts and main bg-color

404.md

@@ -0,0 +1,5 @@
+---
+layout: error
+title: 404
+message: This page could not be found!
+---

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.2.4] - 2020-05-27
+
+### Fixed
+
+- Layouts not available when using as Jekyll theme
+- Background color of `main`
+
 ## [0.2.2] - 2020-05-27
 
 ### Added
@@ -32,6 +39,7 @@ All notable changes to this project will be documented in this file.
 - Unnecessary files from Jekyll build/serve
 
 
-[unreleased]: https://github.com/oAGoulart/vitrina/compare/v0.2.2...HEAD
+[unreleased]: https://github.com/oAGoulart/vitrina/compare/v0.2.4...HEAD
+[0.2.4]: https://github.com/oAGoulart/vitrina/releases/tag/v0.2.4
 [0.2.2]: https://github.com/oAGoulart/vitrina/releases/tag/v0.2.2
 [0.2.0]: https://github.com/oAGoulart/vitrina/releases/tag/v0.2.0

README.md

@@ -41,6 +41,24 @@ This theme may be exactly what you need or exactly what you're trying to avoid.
 
 ## About the layout
 
+There are some layouts at `_layouts` which can be used to create an entire page by just making a markdown page, those include:
+
++ blog (this one uses pagination, ext. must be `.html`)
++ contact
++ error
++ home
++ papers
++ post
++ projects
++ resume
+
+```md
+---
+layout: contact
+title: Contact
+---
+```
+
 The layout is made by many elements, all elements have global attributes, while some have specific ones.
 
 Any element **CAN** have the following global attributes:

_layouts/blog.html

@@ -0,0 +1,53 @@
+---
+layout: default
+---
+
+{{ content }}
+
+<div class="page-head">
+  <h1 class="title is-size-1 has-text-centered has-text-info">{{ page.title }}</h1>
+</div>
+
+<div class="section blog">
+  <div class="container page">
+  {% if paginator.posts[0] %}
+    {% for post in paginator.posts %}
+      <h1>
+        <a class="title" href="{{ post.url | relative_url }}">{{ post.title }}</a>
+      </h1>
+
+      <p class="author">
+      {% if post.author %}
+        <span>by {{ post.author }}</span>
+      {% endif %}
+
+      {% if post.author and post.date %}
+        <span> - </span>
+      {% endif %}
+
+      {% if post.date %}
+        <span>{{ post.date | date: '%B %d, %Y' }}</span>
+      {% endif %}
+      </p>
+
+      <p class="categories">
+      {% for category in post.categories %}
+        <span>{{ category }}</span>
+      {% endfor %}
+      </p>
+
+      <div class="post-body">{{ post.excerpt }}</div><hr>
+
+    {% endfor %}
+
+  {% else %}
+    <div class="post-body">
+      <p class="has-text-centered">There's no content to be shown here!</p>
+    </div>
+
+  {% endif %}
+
+  {% include pagination.html %}
+
+  </div> {% comment %} container {% endcomment %}
+</div> {% comment %} section {% endcomment %}

contact.html → _layouts/contact.html

@@ -1,8 +1,9 @@
 ---
 layout: default
-title: Contact
 ---
 
+{{ content }}
+
 <div class="contacts">
   <h1 class="title is-size-1 has-text-centered has-text-primary">{{ page.title }}</h1>
   <div class="section section-card">

_layouts/error.html

@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+{{ content }}
+
+<div class="error">
+  <h1 class="title is-size-1 has-text-centered has-text-primary">{{ page.title }}</h1>
+  <h2 class="subtitle has-text-centered has-text-primary">{{ page.message }}</h2>
+</div>

_includes/home.html → _layouts/home.html

@@ -1,3 +1,9 @@
+---
+layout: default
+---
+
+{{ content }}
+
 {% assign data = site.data.home %}
 
 {% for part in data %}

papers.html → _layouts/papers.html

@@ -1,8 +1,9 @@
 ---
 layout: default
-title: Papers
 ---
 
+{{ content }}
+
 <div class="page-head">
   <h1 class="title is-size-1 has-text-centered has-text-info">{{ page.title }}</h1>
 </div>

projects.html → _layouts/projects.html

@@ -1,8 +1,9 @@
 ---
 layout: default
-title: Projects
 ---
 
+{{ content }}
+
 {% assign per_column = 3 %}
 
 <div class="projects">

resume.html → _layouts/resume.html

@@ -1,8 +1,9 @@
 ---
 layout: default
-title: Resume
 ---
 
+{{ content }}
+
 <div class="resume">
   <h1 class="title is-size-1 has-text-centered has-text-primary">{{ page.title }}</h1>
   <div class="section section-card">

_sass/elements.scss

@@ -21,7 +21,6 @@ hr {
 }
 
 main {
-  background-color: $grey-lighter;
   min-height: 100vh;
 
   .contacts,
@@ -103,6 +102,10 @@ main {
   & > .section:nth-child(even) {
     background-color: $white;
   }
+
+  & > .section:nth-child(odd) {
+    background-color: $grey-lighter;
+  }
 }
 
 ul:not(.task-list) {

blog/index.html

@@ -1,52 +1,4 @@
 ---
-layout: default
+layout: blog
 title: Blog
 ---
-
-<div class="page-head">
-  <h1 class="title is-size-1 has-text-centered has-text-info">{{ page.title }}</h1>
-</div>
-
-<div class="section blog">
-  <div class="container page">
-  {% if paginator.posts[0] %}
-    {% for post in paginator.posts %}
-      <h1>
-        <a class="title" href="{{ post.url | relative_url }}">{{ post.title }}</a>
-      </h1>
-
-      <p class="author">
-      {% if post.author %}
-        <span>by {{ post.author }}</span>
-      {% endif %}
-
-      {% if post.author and post.date %}
-        <span> - </span>
-      {% endif %}
-
-      {% if post.date %}
-        <span>{{ post.date | date: '%B %d, %Y' }}</span>
-      {% endif %}
-      </p>
-
-      <p class="categories">
-      {% for category in post.categories %}
-        <span>{{ category }}</span>
-      {% endfor %}
-      </p>
-
-      <div class="post-body">{{ post.excerpt }}</div><hr>
-
-    {% endfor %}
-
-  {% else %}
-    <div class="post-body">
-      <p class="has-text-centered">There's no content to be shown here!</p>
-    </div>
-
-  {% endif %}
-
-  {% include pagination.html %}
-
-  </div> {% comment %} container {% endcomment %}
-</div> {% comment %} section {% endcomment %}

contact.md

@@ -0,0 +1,4 @@
+---
+layout: contact
+title: Contact
+---

index.md

@@ -0,0 +1,3 @@
+---
+layout: home
+---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrina",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "A general purpose, configurable, Jekyll theme",
   "main": "index.html",
   "author": {

papers.md

@@ -0,0 +1,4 @@
+---
+layout: papers
+title: Papers
+---

projects.md

@@ -0,0 +1,4 @@
+---
+layout: projects
+title: Projects
+---

resume.md

@@ -0,0 +1,4 @@
+---
+layout: resume
+title: Resume
+---

vitrina.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'vitrina'
-  s.version       = '0.2.2'
+  s.version       = '0.2.4'
   s.authors       = ['Augusto Goulart']
   s.email         = ['josegoulart.aluno@unipampa.edu.br']