midgard/zeus.ugent.be
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be

Browse source
This commit is contained in:
Lorin Werthen 2017-10-11 18:07:20 +02:00
parent b3a3e36a08 9a7fb313c3
commit 15a706fdce
No known key found for this signature in database
GPG key ID: F11FFC921E0E08E0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
layouts/partials/_events_tile.erb
View file

@ -8,7 +8,7 @@
<a href="<%= @event.path %>" class="tile is-child box backgroundimg"> <a href="<%= @event.path %>" class="tile is-child box backgroundimg">
<% end %> <% end %>
<div class="content"> <div class="content">
<div class="columns"> <div class="columns events-tile">
<div class="column"> <div class="column">
<h2> <h2>
<%= @event[:title] %> <%= @event[:title] %>
@ -16,9 +16,9 @@
</div> </div>
<div class="column is-narrow"> <div class="column is-narrow">
<small> <small>
<%= @event[:time].strftime('%A %d %B %Y %H:%M') %> <%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B %Y %H:%M') %>
<br> <br>
<%= @event[:location] %> <%= fa :'map-marker', fw: true %><%= @event[:location] %>
</small> </small>
</div> </div>
</div> </div>

1
lib/helpers/font_awesome.rb
View file

@ -6,6 +6,7 @@ module FontAwesomeHelper
classes << 'fa-li' if opts[:li] classes << 'fa-li' if opts[:li]
classes << "fa-stack-#{opts[:stack]}" if opts[:stack] classes << "fa-stack-#{opts[:stack]}" if opts[:stack]
classes << 'fa-inverse' if opts[:inverse] classes << 'fa-inverse' if opts[:inverse]
classes << 'fa-fw' if opts[:fw]
classes << opts[:class] classes << opts[:class]
"<i class='#{classes.reject(&:nil?).join(' ')}'></i>" "<i class='#{classes.reject(&:nil?).join(' ')}'></i>"