From 32cb7aea7276d38687e269acbc9080a70b1ca726 Mon Sep 17 00:00:00 2001
From: Lorin Werthen <werthenlorin@gmail.com>
Date: Tue, 4 Oct 2016 22:04:34 +0200
Subject: [PATCH] stufff

---
 .../assets/stylesheets/includes/blogpost.scss | 20 ++++++--
 .../stylesheets/includes/eventpage.scss       |  4 ++
 .../assets/stylesheets/includes/events.scss   |  1 -
 .../assets/stylesheets/includes/general.scss  | 46 +++++++++++++++++++
 .../assets/stylesheets/includes/tiles.scss    |  1 +
 content/events/16-17/datacenter.md            |  2 +-
 content/index.erb                             | 12 +++--
 content/search.erb                            |  4 +-
 layouts/archive_page.erb                      |  6 +--
 layouts/default.erb                           |  3 +-
 layouts/eventpost.erb                         |  3 +-
 layouts/partials/_navbar.erb                  |  4 +-
 12 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/content/assets/stylesheets/includes/blogpost.scss b/content/assets/stylesheets/includes/blogpost.scss
index a23d397..56ef7eb 100644
--- a/content/assets/stylesheets/includes/blogpost.scss
+++ b/content/assets/stylesheets/includes/blogpost.scss
@@ -8,9 +8,19 @@
   margin-bottom:10px;
 }
 
-.bolder a{
-  color:#565C5E;
-  font-weight: bold;
-  font-size: 20pt;
-  font-family: 'Avenir';
+.bolder {
+  > * {
+    color:#565C5E;
+    font-weight: bold;
+    font-size: 20pt;
+    font-family: 'Avenir';
+
+    border-left: 3px solid $zeus-orange;
+
+    padding-left: 10px;
+  }
+
+  a {
+    border-left: none;
+  }
 }
diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss
index 7eaccc2..31f31cb 100644
--- a/content/assets/stylesheets/includes/eventpage.scss
+++ b/content/assets/stylesheets/includes/eventpage.scss
@@ -19,3 +19,7 @@
     height: 256px;
   }
 }
+
+.event-attributes {
+  font-size: 1.3em;
+}
diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss
index 6fcabf2..46ff669 100644
--- a/content/assets/stylesheets/includes/events.scss
+++ b/content/assets/stylesheets/includes/events.scss
@@ -58,7 +58,6 @@
     .description {
       font-size: 1.7em;
       font-weight: 200;
-      color: #FF7F00;
     }
 
     .time {
diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss
index 0aeee4a..ed1fae5 100644
--- a/content/assets/stylesheets/includes/general.scss
+++ b/content/assets/stylesheets/includes/general.scss
@@ -53,3 +53,49 @@ footer.footer {
   color: white;
   background: rgba(255, 127, 0, 0.99);
 }
+<<<<<<< Updated upstream
+=======
+
+.imgcenter {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.hydra-tile {
+  background-color: #1E64C8;
+}
+
+.lana-tile {
+  background-color: $tile-orange;
+}
+
+#tipue_search_input {
+  background: none;
+  padding: 12px;
+  font: inherit;
+  color: inherit;
+
+  display: flex;
+  flex-direction: row;
+
+  input {
+    background: none;
+    border: none;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    box-shadow: none;
+    outline: 0;
+    margin: 0;
+
+    color: inherit;
+  }
+
+  &::before {
+    font: normal normal normal 14px/1 FontAwesome;
+    content: "\f002 ";
+    color: inherit;
+    padding-right: 5px;
+  }
+}
+>>>>>>> Stashed changes
diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss
index cb7c6a0..2ca46e8 100644
--- a/content/assets/stylesheets/includes/tiles.scss
+++ b/content/assets/stylesheets/includes/tiles.scss
@@ -13,6 +13,7 @@ a.box {
 .centering {
   display: flex;
   justify-content: center;
+  align-items: center;
 }
 .highlighted{
   background: $tile-orange;
diff --git a/content/events/16-17/datacenter.md b/content/events/16-17/datacenter.md
index 61dfcf9..7b1153d 100644
--- a/content/events/16-17/datacenter.md
+++ b/content/events/16-17/datacenter.md
@@ -4,7 +4,7 @@ banner: https://emergingtechblog.emc.com/wp-content/uploads/2015/10/AdobeStock_8
 description: Zeus bezoekt het datacenter en de supercomputer in S10!
 created_at: 3-10-2016
 time: 10-10-2016
-location: hpc gent
+location: Datacenter UGent, S10, Sterre
 locationlink: 51.023650, 3.712018
 ---
 
diff --git a/content/index.erb b/content/index.erb
index 1e391ef..7dabac3 100644
--- a/content/index.erb
+++ b/content/index.erb
@@ -14,10 +14,9 @@
         <%= render '/partials/_tile.*', article: all_events[1], small_text: "Upcoming event" %>
       </div>
       <div class="tile is-parent is-4">
-        <div class="tile is-child box  ">
-          <div class="content has-text-centered ">
+        <div class="tile is-child box centering">
+          <div class="content has-text-centered">
             <div id="quote" >
-              <!--<img src="//thecatapi.com/api/images/get?format=src&type=gif&size=small"> -->
               <!-- INTENTIONALLY LEFT BLANK -->
             </div>
           </div>
@@ -39,6 +38,7 @@
           </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">
@@ -54,6 +54,12 @@
               </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">
diff --git a/content/search.erb b/content/search.erb
index 33d1e70..0504678 100644
--- a/content/search.erb
+++ b/content/search.erb
@@ -18,13 +18,13 @@ title: Search
 </div>
 <script>
 $(document).ready(function() {
-  $('#tipue_search_input').tipuesearch({
+  $('#tipue_search_input_field').tipuesearch({
     'mode': 'json',
     'showTitleCount': false,
     'tipue_search_content': '#blog_results',
     'contentLocation': '../blog_search.json'
   });
-  $('#tipue_search_input').tipuesearch({
+  $('#tipue_search_input_field').tipuesearch({
     'mode': 'json',
     'showTitleCount': false,
     'tipue_search_content': '#event_results',
diff --git a/layouts/archive_page.erb b/layouts/archive_page.erb
index f8d0e93..53f9250 100644
--- a/layouts/archive_page.erb
+++ b/layouts/archive_page.erb
@@ -6,8 +6,8 @@
         <article class="media">
           <div class="media-content">
             <div class="content">
-              <h2><%= post[:title] %></h2>
-              <%= excerptize(post.reps[:text].compiled_content, length: 200) %>
+              <h2><%= post[:title] %> <small> <%= post[:created_at] %></small></h2>
+              <%= post[:description] %>
             </div>
           </div>
         </article>
@@ -19,7 +19,7 @@
     <ul class = "archive_list">
       <% academic_years_items.each do |year, item| %>
         <li class="bolder">
-          <%= link_to pretty_year(year), item %>
+          <%= link_to_unless_current pretty_year(year), item %>
         </li>
       <% end %>
     </ul>
diff --git a/layouts/default.erb b/layouts/default.erb
index 0e48926..39eca22 100644
--- a/layouts/default.erb
+++ b/layouts/default.erb
@@ -15,7 +15,6 @@
     <link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
 
 
-    <%= asset :css, :main %>
 
     <link rel="icon" href="/assets/images/favicon32.png" type="image/x-icon" />
 
@@ -35,6 +34,8 @@
     <!-- Place this tag in your head or just before your close body tag. -->
     <script async defer src="https://buttons.github.io/buttons.js"></script>
 
+    <%= asset :css, :main %>
+
     <%= content_for(@item, :head) %>
   </head>
   <body class="site">
diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb
index 99635ed..2052bb8 100644
--- a/layouts/eventpost.erb
+++ b/layouts/eventpost.erb
@@ -16,13 +16,14 @@
           <p class="title is-1">
             <b>
               <%= item[:title] %>
+              <%= fa :search %>
             </b>
           </p>
           <p class="subtitle is-3">
             <%= item[:description] %>
           </p>
           <p class="subtitle is-3">
-            <ul class="fa-ul">
+            <ul class="fa-ul event-attributes">
               <li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %></li>
               <li><%= fa 'map-marker', li: true %><%= item[:location] %></li>
             </ul>
diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb
index 856abfc..d54a058 100644
--- a/layouts/partials/_navbar.erb
+++ b/layouts/partials/_navbar.erb
@@ -18,7 +18,9 @@
             <% end %>
           </div>
           <form action="/search/?" method="get">
-            <input type="text" name="q" id="tipue_search_input" autocomplete="off">
+            <div id="tipue_search_input">
+              <input type="text" name="q" id="tipue_search_input_field" autocomplete="off">
+            </div>
           </form>