Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into gala-avond

This commit is contained in:
Lorin Werthen 2016-10-10 22:25:40 +02:00
commit b712b33894
3 changed files with 10 additions and 3 deletions

View file

@ -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'

View file

@ -3,10 +3,17 @@
<meta property="og:title" content="<%= item[:title] %>" />
<meta property="og:type" content="article" />
<meta property="og:url" content="<%= url_for(item) %>" />
<meta property="og:description" content="<%= item[:description] %>" />
<meta property="og:site_name" content="Zeus WPI" />
<meta name="twitter:label1" value="Time" />
<meta name="twitter:data1" value="<%= item[:time].strftime '%A %d %B %Y %H:%M' %>" />
<meta name="twitter:label2" value="Place" />
<meta name="twitter:data2" value="<%= item[:location] %>" />
<meta name="twitter:card" content="summary_large_image" />
<% end %>
<% if item[:banner] %>
<section class="hero is-medium is-primary is-bold" style="background-image:url('<%= item[:banner] %>');">
<section class="hero is-medium is-primary is-bold" style="background-image:url('<%= item[:banner] %>');background-position:center;">
<% else %>
<section class="hero is-medium is-primary is-bold">
<% end %>

View file

@ -18,7 +18,7 @@
<%= event[:description] %>
</div>
<div class="time">
<%= event[:time] %>
<%= event[:time].strftime '%A %d %B %Y %H:%M' %>
</div>
</div>