Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into better-blog-post

This commit is contained in:
Lorin Werthen 2016-11-01 21:52:51 +01:00
commit 9f81fe1036
No known key found for this signature in database
GPG key ID: F11FFC921E0E08E0
3 changed files with 46 additions and 46 deletions

View file

@ -31,6 +31,7 @@ dl {
.padbox { .padbox {
margin-bottom:10px; margin-bottom:10px;
border-radius: 0 !important;
} }
.blogwidth{ .blogwidth{

View file

@ -10,6 +10,8 @@
// Sticky footer // Sticky footer
body.site { body.site {
overflow-x: hidden;
display: flex; display: flex;
min-height: 100vh; min-height: 100vh;
flex-direction: column; flex-direction: column;

View file

@ -28,14 +28,11 @@
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<p class="title is-3"><%= post[:title] %></p> <p class="title is-3"><%= post[:title] %></p>
<p class="subtitle is-5"><% if post[:author] %> <p class="subtitle is-5">
<% if post[:lang] == :en %> <% if post[:author] %>
by by <%= post[:author] %>
<% else %>
door
<% end %> <% end %>
<%= post[:author] %> </p>
<% end %></p>
<div class="content"> <div class="content">
<%= post[:description] %> <%= post[:description] %>
<br> <br>