From cef04e563556a17c4ee935259744cd96a3ba2006 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 10 Oct 2016 13:54:08 +0200 Subject: [PATCH 1/4] fix date formatting for events --- layouts/partials/_event_preview.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/_event_preview.erb b/layouts/partials/_event_preview.erb index b635b81..9878855 100644 --- a/layouts/partials/_event_preview.erb +++ b/layouts/partials/_event_preview.erb @@ -18,7 +18,7 @@ <%= event[:description] %>
- <%= event[:time] %> + <%= event[:time].strftime '%A %d %B %Y %H:%M' %>
From 604616049983a6739fac09bc7b4999a0d9ec52f3 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 10 Oct 2016 13:59:06 +0200 Subject: [PATCH 2/4] background tweak --- layouts/eventpost.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 51ec605..dc6d4e3 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -6,7 +6,7 @@ <% end %> <% if item[:banner] %> -
+
<% else %>
<% end %> From f4d5b063079e0d77ee8752faf5118279e2abc130 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 10 Oct 2016 19:16:08 +0200 Subject: [PATCH 3/4] fix #12 --- layouts/eventpost.erb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index dc6d4e3..14104d0 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -3,6 +3,13 @@ + + + + + + + <% end %> <% if item[:banner] %> From 643185edf0d8a4109006bdf686691c27e2812ad5 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 10 Oct 2016 22:20:33 +0200 Subject: [PATCH 4/4] updated travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19f3bf8..c99147e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,4 @@ script: after_success: - mv deploy_key ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa -- '$TRAVIS_PULL_REQUEST || [[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc deploy public' +- '[ -z "$TRAVIS_PULL_REQUEST" ] || [[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc deploy public'