pushing on master

content/assets/scripts/eventpost.coffee

@@ -1,14 +0,0 @@
-sticky_relocate = ->
-  window_top = $(window).scrollTop()
-  div_top = $('#sticky-anchor').offset().top
-
-  if window_top > div_top
-    $('#sticky').addClass('stick')
-    $('#sticky-anchor').height($('#sticky').outerHeight())
-  else
-    $('#sticky').removeClass('stick')
-    $('#sticky-anchor').height(0)
-
-$ ->
-  $(window).scroll(sticky_relocate)
-  sticky_relocate()

content/assets/stylesheets/main.scss

@@ -1,9 +1,16 @@
 $zeus-orange: #FF7F00;
+
 $orange: $zeus-orange;
 $primary: $orange;
+$link-visited: $orange;
 
 @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700);
 $family-sans-serif: 'Open Sans', sans-serif;
 
 @import "old";
 @import "../../../node_modules/bulma/bulma";
+
+.fa-inline {
+  font-size: inherit;
+  vertical-align: inherit;
+}

content/assets/stylesheets/old.scss

@@ -17,26 +17,6 @@ img {
   }
 }
 
-#logos {
-  display: inline-block;
-  color: black;
-
-  a, a:hover, a:visited, a:link, a:active {
-    text-decoration: none;
-    color: currentColor;
-  }
-
-  .logo-link {
-    margin-left: 10px;
-    transition: 0.2s;
-
-    &:hover {
-      color: $zeus_orange;
-      transition: 0.2s;
-    }
-  }
-}
-
 .header-top {
   display: flex;
   justify-content: space-between;
@@ -45,95 +25,24 @@ img {
 }
 
 #navbar {
-  a {
+  .nav-item {
-    padding: 8px;
     transition: 0.2s;
 
     font-variant: small-caps;
     font-size: 1.25em;
 
-    &, &:hover, &:visited, &:link, &:active {
-      text-decoration: none;
-    }
     &:hover {
-      background-color: $zeus_orange;
       transition: 0.2s;
-      color: white;
     }
   }
 }
 
-/*#all-events {
-  margin-left: -10px;
-  margin-right: -10px;
-
-  .event {
-    border: 2px solid $event-border-color;
-    position: relative;
-
-    overflow: hidden;
-
-    height: 200px;
-    margin: $event-padding;
-
-    &:after {
-      content: '\A';
-      position: absolute;
-      width: 100%; height:100%;
-      top:0; left:0;
-      background:rgba(0,0,0,0.6);
-      opacity: 0;
-      transition: all 0.5s;
-      -webkit-transition: all 0.5s;
-    }
-    &:hover:after {
-      opacity: 1;
-    }
-  }
-}*/
-
-
-#event-banner {
-  position: fixed;
-  min-width: 100%;
-}
-
-#event-description {
-  padding: 20px;
-}
-
-#event-info {
-  padding-top: 20px;
-}
-
-#event-content {
-  position: absolute;
-  top: 400px;
-  background-color: white;
-  height: 100vh;
-
-  border-top: 2px solid $navbar-border-color;
-}
-
-#event-title {
-  text-align: center;
-  font-size: 50px;
-  line-height: 50px;
-}
-
-#sticky.stick {
-  position: fixed;
-  top: 0;
-  z-index: 10000;
-  width: 100%;
-  background-color: white;
-}
-
 #cammie {
   object-fit: contain;
   max-width: 100%;
   height: auto;
 }
+
 .fullpage {
   min-width: 100%;
   min-height: 100%;
@@ -186,33 +95,3 @@ img {
   width: 100%;
   bottom: 0;
 }
-
-
-.project-card {
-  background-color: #2D5CB4;
-  color: white;
-  height: 300px;
-
-  margin-top: 5px;
-  margin-bottom: 5px;
-
-  display: flex;
-  justify-content: space-between;
-
-  .project-title {
-    background: #1e3c72; /* fallback for old browsers */
-    background: -webkit-linear-gradient(to left, #1e3c72 , #2a5298); /* Chrome 10-25, Safari 5.1-6 */
-    background: linear-gradient(to left, #1e3c72 , #2a5298); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
-
-    font-size: 4em;
-    padding: 20px;
-    flex-grow: 1;
-  }
-
-  .project-description {
-    background-color: #1e3c72;
-    text-align: right;
-    padding: 20px;
-    width: 700px;
-  }
-}

layouts/eventpost.erb

@@ -5,10 +5,7 @@
 <meta property="og:url" content="<%= url_for(item) %>" />
 <% end %>
 
-<!--
+<section class="hero is-medium is-danger">
-<img class="pure-img" id="event-banner" src="<%= item[:banner] %>" alt="" />
--->
-<section class="hero is-medium is-primary is-bold">
   <div class="hero-head">
     <%= render '/partials/_navbar.*' %>
   </div>
@@ -29,17 +26,21 @@
 
 <section class="section">
   <div class="columns">
-    <!-- Wrapper needed to add some padding to the grid class -->
+
-    <div class="content container">
+    <div class="container">
-      <%= yield %>
+      <div id="event-info" class="is-pulled-right">
-    </div>
+        <div class="box">
-    <div id="event-info" class="column is-one-quarter content">
+          <ul class="fa-ul">
-      <ul class="fa-ul">
+            <li><i class="fa-li fa fa-clock-o"></i><%= item[:time] %></li>
-        <li><i class="fa-li fa fa-clock-o"></i><%= item[:time] %></li>
+            <li><i class="fa-li fa fa-globe"></i><%= item[:location] %></li>
-        <li><i class="fa-li fa fa-globe"></i><%= item[:location] %></li>
+          </ul>
-      </ul>
+        </div>
+      </div>
+
+      <div class="content">
+        <%= yield %>
+      </div>
     </div>
+
   </div>
 </section>
-
-<script src="/assets/scripts/eventpost.js"></script>

layouts/generic.erb

@@ -10,7 +10,7 @@
   <div class="container">
     <div class="content has-text-centered">
       <p>
-        Made with <i class="fa fa-heart"></i> by Zeus WPI
+        Made with <i class="fa fa-heart fa-inline"></i> by Zeus WPI
       </p>
     </div>
   </div>

layouts/partials/_navbar.erb

@@ -4,19 +4,19 @@
       <img id="logo" src="https://zeus.ugent.be/wp-content/uploads/2009/05/logo-new.png" alt="" />
     </a>
 
-    <a class="nav-item" href="/about">
+    <a class="nav-item is-tab" href="/about">
       About
     </a>
-    <a class="nav-item" href="/archives">
+    <a class="nav-item is-tab" href="/archives">
       Archief
     </a>
-    <a class="nav-item" href="/projects">
+    <a class="nav-item is-tab" href="/projects">
       Projecten
     </a>
-    <a class="nav-item" href="/cammie">
+    <a class="nav-item is-tab" href="/cammie">
       Cammie
     </a>
-    <a class="nav-item" href="/search">
+    <a class="nav-item is-tab" href="/search">
       Zoeken
     </a>
   </div>