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

Merge branch 'master' into fix-search

Browse source
This commit is contained in:
Wout Schellaert 2016-10-04 16:43:05 +02:00 committed by GitHub
commit 62a8016b33
3 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
content/assets/stylesheets/includes/tiles.scss
View file

@ -14,3 +14,23 @@ a.box {
display: flex;
justify-content: center;
}
.highlighted{
background: $tile-orange;
.content {
color: white;
h1, h2 {
color: inherit;
}
a {
color:inherit;
}
}
}
#quote{
font-style: italic;
}
.icon a{
color:$tile-orange;
}

2
content/assets/stylesheets/includes/variables.scss
View file

@ -2,6 +2,8 @@
$zeus-orange: #FF7F00;
$zeus-blue: #00C4FF;
$tile-orange: #ff9f1a;
$navbar-border-color: #CCC;
$event-border-color: #DDD;
$orange: $zeus-orange;

24
content/index.erb
View file

@ -14,26 +14,26 @@
<%= render '/partials/_tile.*', article: all_events[1], small_text: "Upcoming event" %>
</div>
<div class="tile is-parent is-4">
<div class="tile is-child box highlighted">
<!-- <img src="//thecatapi.com/api/images/get?format=src&type=gif&size=small"> -->
<div class="content has-text-centered">
<blockquote id="quote" >
<div class="tile is-child box ">
<div class="content has-text-centered ">
<div id="quote" >
<!--<img src="//thecatapi.com/api/images/get?format=src&type=gif&size=small"> -->
<!-- INTENTIONALLY LEFT BLANK -->
</blockquote>
</div>
</div>
</div>
</div>
<div class="tile is-vertical is-2">
<div class="tile is-parent">
<a class="tile box" href="https://zeus.ugent.be/wiki">
<div class="tile is-child imgcenter" >
<a class="tile box " href="https://zeus.ugent.be/wiki">
<div class="tile is-child imgcenter icon" >
<%= fa 'wikipedia-w' %>
</div>
</a>
</div>
<div class="tile is-parent">
<a class="tile box" href="/cammie">
<div class="tile is-child imgcenter">
<div class="tile is-child imgcenter icon">
<%= fa 'video-camera' %>
</div>
</a>
@ -42,14 +42,14 @@
<div class="tile is-vertical is-2">
<div class="tile is-parent">
<a class="tile box" href="https://github.com/ZeusWPI">
<div class="tile is-child imgcenter">
<div class="tile is-child imgcenter icon">
<%= fa 'github' %>
</div>
</a>
</div>
<div class="tile is-parent">
<a class="tile box" href="https://www.facebook.com/zeus.wpi/?fref=ts">
<div class="tile is-child imgcenter">
<div class="tile is-child imgcenter icon">
<%= fa 'facebook-official' %>
</div>
</a>
@ -58,11 +58,11 @@
</div>
<div class="tile">
<div class="tile is-4 is-parent">
<%= render '/partials/_tile.*', article: sorted_articles.first, small_text: "Latest blogpost" %>
<%= render '/partials/_tile.*', article: sorted_articles.first, small_text: "Latest blogpost",htmlclass:"highlighted"%>
</div>
<div class="tile is-vertical">
<div class="tile is-parent">
<div class="tile is-child box">
<div class="tile is-child box ">
<div class="content">
<h1><a href="https://zeus.ugent.be/game">Top Zeus WPI coders this week</a></h1>
<div id="gamification-coders">