Merge remote-tracking branch 'origin/master' into searchpage

Rules

@@ -14,6 +14,8 @@ require 'socket'
 #
 
 preprocess do
+  `npm install`
+
   @items.find_all('/posts/**/*').each do |i|
     year_str = %r{/(\d\d)-\d\d/}.match(i.identifier).captures[0]
     academic_year = year_str.to_i

content/assets/stylesheets/includes/general.scss

@@ -10,6 +10,14 @@
   text-align: justify;
 }
 
+header.section {
+  padding-bottom: 10px;
+}
+
+main.section {
+  padding-top: 20px;
+}
+
 
 #navbar {
   align-items: flex-end;
@@ -68,6 +76,10 @@ footer.footer {
   background-color: $tile-orange;
 }
 
+.project-tile {
+  background-color: $turquoise;
+}
+
 #tipue_search_input {
   background: none;
   padding: 12px;

content/assets/stylesheets/includes/projects.scss

@@ -38,3 +38,8 @@
   font-size: 6vw;
   font-family: $family-sans-serif;
 }
+
+.logo-index {
+  font-size: 4vw;
+  color: white;
+}

content/assets/stylesheets/includes/variables.scss

@@ -6,8 +6,11 @@ $tile-orange: #ff9f1a;
 
 $navbar-border-color: #CCC;
 $event-border-color: #DDD;
+
 $orange: $zeus-orange;
 $blue: $zeus-blue;
+$turquoise: #30D1B2;
+
 $primary: $orange;
 
 $family-sans-serif: 'Lato', sans-serif;

content/index.erb

@@ -22,24 +22,15 @@
           </div>
         </div>
       </div>
-      <div class="tile is-vertical is-2">
+      <div class="tile is-parent is-2">
-        <div class="tile is-parent">
+        <a class="tile box is-child imgcenter project-tile" href="/projects/#12urenloop">
-          <a class="tile box " href="https://zeus.ugent.be/wiki">
+          <div class="logo-index has-text-centered">
-            <div class="tile is-child imgcenter icon" >
+            12UL
-              <%= fa 'wikipedia-w' %>
+          </div>
-            </div>
+        </a>
-          </a>
-        </div>
-        <div class="tile is-parent">
-          <a class="tile box" href="/cammie">
-            <div class="tile is-child imgcenter icon">
-              <%= fa 'video-camera' %>
-            </div>
-          </a>
-        </div>
       </div>
       <div class="tile is-parent is-2">
-        <a class="tile is-child imgcenter box hydra-tile" href="//student.ugent.be/hydra">
+        <a class="tile is-child imgcenter box hydra-tile" href="/projects/#hydra">
           <%= asset :img, 'hydra-logo.png' %>
         </a>
       </div>

content/projects.erb

@@ -4,7 +4,7 @@ title: Projecten
 order: 30
 ---
 <div class="container project content">
-  <article class="columns">
+  <article id="hydra" class="columns">
     <div class="column is-one-quarter" id="logo-column">
       <div class="hydra-scrot">
         <img src="/assets/images/hydra.png">

content/projects/badass_bottle_bats.md

@@ -1,5 +1,5 @@
 ---
-title: Badass Battle Bots
+title: Badass Bottle Bats
 description: A bot writing contest. <a href="https://zeus.ugent.be/bottlebats">https://zeus.ugent.be/bottlebats</a>
 github: https://github.com/ZeusWPI/aichallenge
 logo_letter: B

layouts/partials/_navbar.erb

@@ -27,22 +27,27 @@
           <div class="nav-right is-hidden-mobile">
               <a class="nav-item" href="https://github.com/ZeusWPI" target="_blank">
                   <span class="icon">
-                      <i class="fa fa-github"></i>
+                    <%= fa :github %>
                   </span>
               </a>
               <a class="nav-item" href="https://www.facebook.com/zeus.wpi/" target="_blank">
                   <span class="icon">
-                      <i class="fa fa-facebook"></i>
+                    <%= fa :facebook %>
                   </span>
               </a>
               <a class="nav-item" href="/feed.xml" target="_blank">
                   <span class="icon">
-                      <i class="fa fa-rss"></i>
+                    <%= fa :rss %>
                   </span>
               </a>
               <a class="nav-item" href="/ical.ics">
                   <span class="icon">
-                      <i class="fa fa-calendar"></i>
+                    <%= fa :calendar %>
+                  </span>
+              </a>
+              <a class="nav-item" href="//zeus.ugent.be/wiki">
+                  <span class="icon">
+                    <%= fa :'wikipedia-w' %>
                   </span>
               </a>
           </div>

layouts/partials/_project.erb

@@ -1,8 +1,8 @@
-<div class="container project content">
+<div id="<%= project.identifier.without_ext.split('/')[-1] %>" class="container project content">
   <article class="columns is-mobile">
     <div class="column is-one-quarter" id="logo-column">
-      <div class="logo" style="background-color: <%=project[:logo_color]%>">
+      <div class="logo" style="background-color: <%= project[:logo_color]%>">
-        <div class="logo-initial has-text-centered"><%=project[:logo_letter]%></div>
+        <div class="logo-initial has-text-centered"><%= project[:logo_letter]%></div>
       </div>
     </div>
     <div class="column">