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

Merge pull request #206 from ZeusWPI/christmas

Browse source 
Christmas
This commit is contained in:
lorin 2017-12-11 20:03:11 +01:00 committed by GitHub
commit abe55ee5dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bundle/config Normal file
View file

@ -0,0 +1,2 @@
---
BUNDLE_WITH: "production"

BIN
content/assets/images/pusheen.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 621 KiB

19
content/assets/stylesheets/includes/cammie.scss
View file

@ -45,6 +45,25 @@
&.diag i { &.diag i {
transform: rotate(45deg); transform: rotate(45deg);
} }
} }
} }
} }
#cammie-section {
.nav-center{
width:100%;
}
button{
background-color: $orange;
color: white;
margin-top: 5px;
border-radius: 0;
border: none;
width: 33.333333333333333333333333333333333333333333333333333%;
&:not(:last-child){
margin-right: 5px;
}
}
}

9
content/assets/stylesheets/includes/navbar.scss
View file

@ -10,11 +10,10 @@
#santa { #santa {
position: absolute; position: absolute;
z-index: 500; z-index: 300;
left: 27px; left: 5px;
top: -1px; top: 10px;
width: 40px; width: 60px;
transform: scale(-1, 1);
} }
} }

2
layouts/partials/_navbar.erb
View file

@ -3,7 +3,7 @@
<div class="logo-wrapper column is-narrow is-hidden-mobile"> <div class="logo-wrapper column is-narrow is-hidden-mobile">
<a id="logo-link" href="/"> <a id="logo-link" href="/">
<% if christmastime? %> <% if christmastime? %>
<img id="santa" src="https://upload.wikimedia.org/wikipedia/commons/c/c0/Santa_hat.svg"> <img id="santa" src="/assets/images/pusheen.png">
<% end %> <% end %>
<img id="logo" src="<%= zeus_logo_url color: @zeus_logo_color %>" alt="" /> <img id="logo" src="<%= zeus_logo_url color: @zeus_logo_color %>" alt="" />
</a> </a>