Merge pull request #31 from ZeusWPI/various

Various

content/assets/stylesheets/includes/cammie.scss

@@ -0,0 +1,58 @@
+#cammie {
+  object-fit: contain;
+  max-width: 100%;
+  height: auto;
+}
+
+.fullpage {
+  min-width: 100%;
+  min-height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: black;
+}
+
+.ctrl {
+  background-color: $cammie-controls-color;
+  color: white;
+  position: absolute;
+  z-index: 100;
+
+  // Chevron centering
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  &:hover {
+    background-color: $zeus_orange;
+    z-index: 200;
+    cursor: pointer;
+  }
+}
+
+#left {
+  height: 100%;
+  width: 100px;
+  top: 0;
+  left: 0;
+}
+
+#right {
+  height: 100%;
+  width: 100px;
+  top: 0;
+  right: 0;
+}
+
+#up {
+  height: 100px;
+  width: 100%;
+  top: 0;
+}
+
+#down {
+  height: 100px;
+  width: 100%;
+  bottom: 0;
+}

content/assets/stylesheets/includes/general.scss

@@ -0,0 +1,24 @@
+img {
+  max-width: 200px;
+}
+
+.fa-ul {
+  list-style: none !important;
+
+  .fa {
+    font-size: inherit;
+  }
+}
+
+#navbar {
+  .nav-item {
+    transition: 0.2s;
+
+    font-variant: small-caps;
+    font-size: 1.25em;
+
+    &:hover {
+      transition: 0.2s;
+    }
+  }
+}

content/assets/stylesheets/includes/variables.scss

@@ -0,0 +1,6 @@
+$zeus_orange: #FF7F00;
+$event-padding: 10px;
+$navbar-border-color: #CCC;
+$event-border-color: #DDD;
+
+$cammie-controls-color: rgba(0, 0, 0, 0.60);

content/assets/stylesheets/main.scss

@@ -7,5 +7,13 @@ $link-visited: $orange;
 @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700);
 $family-sans-serif: 'Open Sans', sans-serif;
 
+
 @import "../../../node_modules/bulma/bulma";
-@import "includes/old";
+
+.nav-right {
+  flex: none;
+}
+
+@import "includes/variables";
+@import "includes/cammie";
+@import "includes/general";

content/ical.ics.erb

@@ -1 +1,2 @@
 <%= event_calendar %>
+<%= data_from "hey" %>

data/bestuur.yaml

@@ -0,0 +1,24 @@
+-
+  rol: Voorzitter
+  naam: Wout Schellaert
+  mail: voorzitter@zeus.ugent.be
+-
+  rol: Vice-voorzitter
+  naam: Isaura Claeys
+  mail: secretaris@zeus.ugent.be
+-
+  rol: Penningmeester
+  naam: Jeroen De Clerck
+  mail: penning@zeus.ugent.be
+-
+  rol: Systeembeheerders
+  naam: Rien Maertens & Lorin Werthen
+  mail: admin@zeus.ugent.be
+-
+  rol: Event manager
+  naam: Eloïse Piret
+  mail: pr@zeus.ugent.be
+-
+  rol: Projectmanager
+  naam: Feliciaan De Palmenaer
+  mail: project@zeus.ugent.be

layouts/partials/_navbar.erb

@@ -1,37 +1,36 @@
 <nav id="navbar" class="nav">
-  <div class="nav-left">
-    <a class="nav-item" href="/">
-      <img id="logo" src="https://zeus.ugent.be/wp-content/uploads/2009/05/logo-new.png" alt="" />
-    </a>
+    <div class="nav-left">
+      <a class="nav-item" href="/">
+        <img id="logo" src="https://zeus.ugent.be/wp-content/uploads/2009/05/logo-new.png" alt="" />
+      </a>
 
-    <% nav_items do |item, active| %>
+      <% nav_items do |item, active| %>
       <a class="nav-item is-tab <%= 'is-active' if active %>" href="<%= relative_path_to(item) %>">
         <%= item[:title] %>
       </a>
-    <% end %>
-  </div>
+      <% end %>
+    </div>
 
-  <div class="nav-right">
-    <a class="nav-item" href="https://github.com/ZeusWPI" target="_blank">
-      <span class="icon">
-        <i class="fa fa-github"></i>
-      </span>
-    </a>
-    <a class="nav-item" href="https://www.facebook.com/zeus.wpi/" target="_blank">
-      <span class="icon">
-        <i class="fa fa-facebook"></i>
-      </span>
-    </a>
-    <a class="nav-item" href="/feed.xml" target="_blank">
-      <span class="icon">
-        <i class="fa fa-rss"></i>
-      </span>
-    </a>
-    <a class="nav-item" href="/ical.ics">
-      <span class="icon">
-        <i class="fa fa-calendar"></i>
-      </span>
-    </a>
-
-  </div>
+    <div class="nav-right">
+        <a class="nav-item" href="https://github.com/ZeusWPI" target="_blank">
+            <span class="icon">
+                <i class="fa fa-github"></i>
+            </span>
+        </a>
+        <a class="nav-item" href="https://www.facebook.com/zeus.wpi/" target="_blank">
+            <span class="icon">
+                <i class="fa fa-facebook"></i>
+            </span>
+        </a>
+        <a class="nav-item" href="/feed.xml" target="_blank">
+            <span class="icon">
+                <i class="fa fa-rss"></i>
+            </span>
+        </a>
+        <a class="nav-item" href="/ical.ics">
+            <span class="icon">
+                <i class="fa fa-calendar"></i>
+            </span>
+        </a>
+    </div>
 </nav>

lib/helpers/data.rb

@@ -0,0 +1,5 @@
+module DataHelper
+  def data_from(identifier)
+    p `ls data`
+  end
+end

lib/helpers_.rb

@@ -7,3 +7,4 @@ include Nanoc::Helpers::Text
 include ArchiveHelper
 include IcalHelper
 include NavigationHelper
+include DataHelper