From 923851a697c2f9d3a3b9b2ec931258abfa0648b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Wed, 21 Sep 2016 17:53:32 +0200 Subject: [PATCH 1/4] idk? --- Rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Rules b/Rules index bb85efe..0c8c881 100644 --- a/Rules +++ b/Rules @@ -28,11 +28,13 @@ preprocess do academic_years.each do |year| @items.create( '', - { academic_year: year }, + { academic_year: year, title: "Blog" }, "/archives/#{year}-#{year + 1}.html", binary: false ) end + + academic_years_items[academic_years.max][:navigable] = true end # From 91b64afaa10dccab6c17c3b20a9e4e16c7d82270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Thu, 22 Sep 2016 21:13:46 +0200 Subject: [PATCH 2/4] blog enzo --- .../assets/stylesheets/includes/blogpost.scss | 11 +++++ content/posts/16-17/moar-review.md | 7 +++ content/posts/16-17/review-c.md | 1 + layouts/archive_page.erb | 47 ++++++++++++------- lib/helpers/archives.rb | 2 +- 5 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 content/posts/16-17/moar-review.md diff --git a/content/assets/stylesheets/includes/blogpost.scss b/content/assets/stylesheets/includes/blogpost.scss index bd7ee28..a23d397 100644 --- a/content/assets/stylesheets/includes/blogpost.scss +++ b/content/assets/stylesheets/includes/blogpost.scss @@ -3,3 +3,14 @@ font-size: 4em; } } + +.padbox{ + margin-bottom:10px; +} + +.bolder a{ + color:#565C5E; + font-weight: bold; + font-size: 20pt; + font-family: 'Avenir'; +} diff --git a/content/posts/16-17/moar-review.md b/content/posts/16-17/moar-review.md new file mode 100644 index 0000000..bbdd7d5 --- /dev/null +++ b/content/posts/16-17/moar-review.md @@ -0,0 +1,7 @@ +--- +title: moar review +description: blub +banner: https://i.ytimg.com/vi/tntOCGkgt98/maxresdefault.jpg +created_at: 24-10-2016 +--- +blub diff --git a/content/posts/16-17/review-c.md b/content/posts/16-17/review-c.md index 7bdbd4d..ed38a66 100644 --- a/content/posts/16-17/review-c.md +++ b/content/posts/16-17/review-c.md @@ -1,4 +1,5 @@ --- +banner: http://dailydropcap.com/images/C-9.jpg title: C review description: We hebben even wat dingen in C geschreven, en dit zijn onze meningen created_at: 23-10-2016 diff --git a/layouts/archive_page.erb b/layouts/archive_page.erb index 7b8cfc2..54a28a5 100644 --- a/layouts/archive_page.erb +++ b/layouts/archive_page.erb @@ -1,19 +1,32 @@ -<% posts_in_year(item[:academic_year]).each do |post| %> - -
- + + <% end %>
- -<% end %> +
+
    + <% academic_years_items.each do |year, item| %> +
  • + <%= link_to pretty_year(year), item %> +
    • + <% end %> +
+
+ diff --git a/lib/helpers/archives.rb b/lib/helpers/archives.rb index f11d29f..0af010a 100644 --- a/lib/helpers/archives.rb +++ b/lib/helpers/archives.rb @@ -11,7 +11,7 @@ module ArchiveHelper end def academic_years_items - academic_years.map { |y| [y, items["/archives/#{y}-#{y + 1}.html"]] }.to_h + academic_years.to_a.reverse.map { |y| [y, items["/archives/#{y}-#{y + 1}.html"]] }.to_h end def pretty_year(year) From de0b47e4dfebd4922d78d92a2168f9ee7400d94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Thu, 22 Sep 2016 21:23:40 +0200 Subject: [PATCH 3/4] bibi archive --- Rules | 4 ++-- content/archives.erb | 11 ----------- lib/helpers/archives.rb | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 content/archives.erb diff --git a/Rules b/Rules index 0c8c881..f94b07b 100644 --- a/Rules +++ b/Rules @@ -29,7 +29,7 @@ preprocess do @items.create( '', { academic_year: year, title: "Blog" }, - "/archives/#{year}-#{year + 1}.html", + "/blog/#{year}-#{year + 1}.html", binary: false ) end @@ -50,7 +50,7 @@ end # # ARCHIVES # -compile '/archives/*' do +compile '/blog/*' do layout '/archive_page.*' layout '/generic.*' layout '/default.*' diff --git a/content/archives.erb b/content/archives.erb deleted file mode 100644 index de70590..0000000 --- a/content/archives.erb +++ /dev/null @@ -1,11 +0,0 @@ ---- -navigable: true -title: Archieven ---- -
    - <% academic_years_items.each do |year, item| %> -
  • - <%= link_to pretty_year(year), item %> -
    • - <% end %> -
diff --git a/lib/helpers/archives.rb b/lib/helpers/archives.rb index 0af010a..fc4ed24 100644 --- a/lib/helpers/archives.rb +++ b/lib/helpers/archives.rb @@ -11,7 +11,7 @@ module ArchiveHelper end def academic_years_items - academic_years.to_a.reverse.map { |y| [y, items["/archives/#{y}-#{y + 1}.html"]] }.to_h + academic_years.to_a.reverse.map { |y| [y, items["/blog/#{y}-#{y + 1}.html"]] }.to_h end def pretty_year(year) From 252d796993226e3c7707e9dc9b153f9609103be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Thu, 22 Sep 2016 21:28:01 +0200 Subject: [PATCH 4/4] fix img --- content/posts/16-17/review-c.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/posts/16-17/review-c.md b/content/posts/16-17/review-c.md index ed38a66..aa9b25f 100644 --- a/content/posts/16-17/review-c.md +++ b/content/posts/16-17/review-c.md @@ -1,5 +1,5 @@ --- -banner: http://dailydropcap.com/images/C-9.jpg +banner: https://thumbs.dreamstime.com/z/letter-c-cat-4240140.jpg title: C review description: We hebben even wat dingen in C geschreven, en dit zijn onze meningen created_at: 23-10-2016