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

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

Browse source
This commit is contained in:
Lorin Werthen 2016-11-01 13:39:21 +01:00
commit f151215aae
No known key found for this signature in database
GPG key ID: F11FFC921E0E08E0
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,20 @@ html, .footer {
} }
} }
#navbar {
margin-bottom: 10px;
.logo-wrapper {
padding-bottom: 0;
}
.actual-nav-bar {
padding-bottom: 0;
border-bottom: 1px solid #eee;
}
}
header.section { header.section {
padding-bottom: 10px; padding-bottom: 10px;
} }
@ -133,6 +147,10 @@ footer.footer {
main.section { main.section {
padding-top: 0px; padding-top: 0px;
} }
.is-narrow {
flex: none;
}
} }
#tipue_search_input { #tipue_search_input {

4
layouts/archive_page.erb
View file

@ -1,4 +1,4 @@
<div class="columns" > <div class="columns is-flex-mobile" >
<div class="column"> <div class="column">
<% posts_in_year(item[:academic_year]).each do |post| %> <% posts_in_year(item[:academic_year]).each do |post| %>
<a href="<%= relative_path_to(post) %>" > <a href="<%= relative_path_to(post) %>" >
@ -15,7 +15,7 @@
</a> </a>
<% end %> <% end %>
</div> </div>
<aside class="menu"> <aside class="column is-narrow menu">
<p class="menu-label"> <p class="menu-label">
Academic Year Academic Year
</p> </p>

4
layouts/partials/_navbar.erb
View file

@ -1,11 +1,11 @@
<div id="navbar"> <div id="navbar">
<div class="columns"> <div class="columns">
<div class="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="/">
<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>
</div> </div>
<div class="column"> <div class="actual-nav-bar column">
<nav class="nav"> <nav class="nav">
<a class="is-hidden-tablet nav-item" href="/"> <a class="is-hidden-tablet nav-item" href="/">
<img id="inline-logo" src="<%= zeus_logo_url color: @zeus_logo_color %>" alt="" /> <img id="inline-logo" src="<%= zeus_logo_url color: @zeus_logo_color %>" alt="" />