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 {
margin-bottom:10px;
border-radius: 0 !important;
}
.blogwidth{

View file

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

View file

@ -1,6 +1,6 @@
<div class="columns" >
<div class="column is-2 is-narrow">
<aside class="menu">
<div class="column is-2 is-narrow">
<aside class="menu">
<p class="menu-label">
Academic Year
</p>
@ -28,14 +28,11 @@
<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
<p class="subtitle is-5">
<% if post[:author] %>
by <%= post[:author] %>
<% end %>
<%= post[:author] %>
<% end %></p>
</p>
<div class="content">
<%= post[:description] %>
<br>
@ -52,4 +49,4 @@
</a>
<% end %>
</div>
</div>
</div>