From 1cc8efbbd67676de81bd4d30275489e898ac24dc Mon Sep 17 00:00:00 2001
From: Benjamin Rombaut <benjamin.rombaut@gmail.com>
Date: Tue, 1 Nov 2016 18:55:33 +0000
Subject: [PATCH 1/2] Improved blog page with mobile menu, author and excerpt

---
 layouts/archive_page.erb | 55 ++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/layouts/archive_page.erb b/layouts/archive_page.erb
index 42a81fa..6893969 100644
--- a/layouts/archive_page.erb
+++ b/layouts/archive_page.erb
@@ -1,21 +1,6 @@
-<div class="columns is-flex-mobile" >
-  <div class="column">
-  <% posts_in_year(item[:academic_year]).each do |post| %>
-    <a href="<%= relative_path_to(post) %>" >
-      <div class="box padbox">
-        <article class="media">
-          <div class="media-content">
-            <div class="content">
-              <h2><%= post[:title] %> <small> <%= post[:created_at] %></small></h2>
-              <%= post[:description] %>
-            </div>
-          </div>
-        </article>
-      </div>
-    </a>
-  <% end %>
-  </div>
-  <aside class="column is-narrow menu">
+<div class="columns" >
+<div class="column is-2 is-narrow">
+<aside class="menu">
     <p class="menu-label">
       Academic Year
     </p>
@@ -35,4 +20,36 @@
       <% end %>
     </ul>
   </aside>
-</div>
+  </div>
+  <div class="column">
+  <% posts_in_year(item[:academic_year]).each do |post| %>
+    <a href="<%= relative_path_to(post) %>">
+    <article class="box padbox">
+        <div class="columns">
+        <div class="column">
+        <p class="title is-3"><%= post[:title] %></p>
+        <p class="subtitle is-5"><% if post[:author] %>
+  <% if post[:lang] == :en %>
+  by
+  <% else %>
+  door
+  <% end %>
+  <%= post[:author] %>
+<% end %></p>
+        <div class="content">
+            <%= post[:description] %>
+            <br>
+            <small><%= post[:created_at] %></small>
+        </div>
+        </div>
+        <div class="column">
+            <div class="content">
+            <%= excerptize(post.reps[:text].compiled_content, length: 200).tr("\n", ' ')%>
+            </div>
+        </div>
+        </div>
+    </article>
+    </a>
+  <% end %>
+    </div>
+    </div>

From 67b4bc2df9f6ce977bd91c7989361dd4e7c6e4ab Mon Sep 17 00:00:00 2001
From: Lorin Werthen <werthenlorin@gmail.com>
Date: Tue, 1 Nov 2016 20:28:24 +0100
Subject: [PATCH 2/2] fix formatting

---
 layouts/archive_page.erb | 89 +++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/layouts/archive_page.erb b/layouts/archive_page.erb
index 6893969..f98b207 100644
--- a/layouts/archive_page.erb
+++ b/layouts/archive_page.erb
@@ -1,55 +1,52 @@
 <div class="columns" >
-<div class="column is-2 is-narrow">
-<aside class="menu">
-    <p class="menu-label">
-      Academic Year
-    </p>
-    <ul class="menu-list">
-      <% academic_years_items.each do |year, item| %>
-      <% if @item_rep && @item_rep.path == item.path %>
-      <li>
-        <a href="#" class="is-active">
-          <%= pretty_year(year) %>
-        </a>
-      </li>
-      <% else %>
-      <li>
-        <%= link_to pretty_year(year), item %>
-      </li>
-      <% end %>
-      <% end %>
-    </ul>
-  </aside>
+  <div class="column is-2 is-narrow">
+    <aside class="menu">
+      <p class="menu-label">
+        Academic Year
+      </p>
+      <ul class="menu-list">
+        <% academic_years_items.each do |year, item| %>
+        <% if @item_rep && @item_rep.path == item.path %>
+        <li>
+          <a href="#" class="is-active">
+            <%= pretty_year(year) %>
+          </a>
+        </li>
+        <% else %>
+        <li>
+          <%= link_to pretty_year(year), item %>
+        </li>
+        <% end %>
+        <% end %>
+      </ul>
+    </aside>
   </div>
   <div class="column">
-  <% posts_in_year(item[:academic_year]).each do |post| %>
+    <% posts_in_year(item[:academic_year]).each do |post| %>
     <a href="<%= relative_path_to(post) %>">
-    <article class="box padbox">
+      <article class="box padbox">
         <div class="columns">
-        <div class="column">
-        <p class="title is-3"><%= post[:title] %></p>
-        <p class="subtitle is-5"><% if post[:author] %>
-  <% if post[:lang] == :en %>
-  by
-  <% else %>
-  door
-  <% end %>
-  <%= post[:author] %>
-<% end %></p>
-        <div class="content">
-            <%= post[:description] %>
-            <br>
-            <small><%= post[:created_at] %></small>
-        </div>
-        </div>
-        <div class="column">
+          <div class="column">
+            <p class="title is-3"><%= post[:title] %></p>
+            <p class="subtitle is-5">
+              <% if post[:author] %>
+              by <%= post[:author] %>
+              <% end %>
+            </p>
             <div class="content">
-            <%= excerptize(post.reps[:text].compiled_content, length: 200).tr("\n", ' ')%>
+              <%= post[:description] %>
+              <br>
+              <small><%= post[:created_at] %></small>
             </div>
+          </div>
+          <div class="column">
+            <div class="content">
+              <%= excerptize(post.reps[:text].compiled_content, length: 200).tr("\n", ' ')%>
+            </div>
+          </div>
         </div>
-        </div>
-    </article>
+      </article>
     </a>
-  <% end %>
-    </div>
-    </div>
+    <% end %>
+  </div>
+</div>