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

Merge branch 'master' into fix/social-icons

Browse source
This commit is contained in:
lorin 2016-10-06 11:23:46 +02:00 committed by GitHub
commit 960a746604
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Rules
View file

@ -156,7 +156,7 @@ ignore '/assets/stylesheets/includes/**/*'
compile '/assets/stylesheets/**/*.scss' do compile '/assets/stylesheets/**/*.scss' do
filter :sass, syntax: :scss filter :sass, syntax: :scss
filter :autoprefixer if Socket.gethostname == 'abysm' filter :autoprefixer
end end
passthrough '/assets/images/*.{png,svg}' passthrough '/assets/images/*.{png,svg}'

4
content/index.erb
View file

@ -7,11 +7,11 @@
<div id="homepage"> <div id="homepage">
<div class="tile is-vertical is-ancestor"> <div class="tile is-vertical is-ancestor">
<div class="tile is-parent is-12"> <div class="tile is-parent is-12">
<%= render '/partials/_tile.*', article: all_events[0], htmlclass: "highlighted", small_text: "Upcoming event" %> <%= render '/partials/_tile.*', article: upcoming_events[0], htmlclass: "highlighted", small_text: "Upcoming event" %>
</div> </div>
<div class="tile"> <div class="tile">
<div class="tile is-parent is-4"> <div class="tile is-parent is-4">
<%= render '/partials/_tile.*', article: all_events[1], small_text: "Upcoming event" %> <%= render '/partials/_tile.*', article: upcoming_events[1], small_text: "Upcoming event" %>
</div> </div>
<div class="tile is-parent is-4"> <div class="tile is-parent is-4">
<div class="tile is-child box centering"> <div class="tile is-child box centering">

4
lib/helpers/events.rb
View file

@ -5,11 +5,11 @@ module EventsHelper
end end
def upcoming_events def upcoming_events
all_events.reject { |x| x[:time] < Date.today } all_events.reject { |x| x[:time] <= Date.today }
end end
def past_events def past_events
all_events.reject { |x| x[:time] >= Date.today } all_events.reject { |x| x[:time] > Date.today }
end end
def grouped_events def grouped_events

4
nanoc.yaml
View file

@ -3,7 +3,7 @@ title: Zeus WPI
author_name: '' author_name: ''
author_uri: '' author_uri: ''
base_url: https://zeus.ugent.be/beta base_url: https://zeus.ugent.be
# The syntax to use for patterns in the Rules file. Can be either `"glob"` # The syntax to use for patterns in the Rules file. Can be either `"glob"`
# (default) or `"legacy"`. The former will enable glob patterns, which behave # (default) or `"legacy"`. The former will enable glob patterns, which behave
@ -99,5 +99,5 @@ checks:
deploy: deploy:
public: public:
kind: rsync kind: rsync
dst: zeusweb-beta@zeus.ugent.be:/home/zeusweb-beta/public dst: zeusweb-new@zeus.ugent.be:/home/zeusweb-new/public
options: [ '-glpPrtvz', '-e', 'ssh -p 2222', '--delete'] options: [ '-glpPrtvz', '-e', 'ssh -p 2222', '--delete']