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

oops

Browse source
This commit is contained in:
Lorin Werthen 2016-10-04 22:06:02 +02:00
parent 32cb7aea72
commit df6ffe9cc6
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
content/assets/stylesheets/includes/general.scss
View file

@ -53,8 +53,6 @@ footer.footer {
color: white;
background: rgba(255, 127, 0, 0.99);
}
<<<<<<< Updated upstream
=======
.imgcenter {
display: flex;
@ -98,4 +96,3 @@ footer.footer {
padding-right: 5px;
}
}
>>>>>>> Stashed changes

18
content/index.erb
View file

@ -38,28 +38,10 @@
</a>
</div>
</div>
<<<<<<< Updated upstream
<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 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 icon">
<%= fa 'facebook-official' %>
</div>
</a>
</div>
=======
<div class="tile is-parent is-2">
<a class="tile is-child imgcenter box hydra-tile" href="//student.ugent.be/hydra">
<%= asset :img, 'hydra-logo.png' %>
</a>
>>>>>>> Stashed changes
</div>
</div>
<div class="tile">