@@ -1,54 +0,0 @@ 
-@font-face {
-    font-family: 'Lato';
-    font-weight: 700;
-    font-style: normal;
-    src: url('../fonts/lato-bol-eot.eot');
-    src: url('../fonts/lato-bol-eot.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/lato-bol-woff.woff') format('woff'),
-         url('../fonts/lato-bol-ttf.ttf') format('truetype'),
-         url('../fonts/lato-bol-svg.svg#latobold') format('svg');
-}
-
-@font-face {
-    font-family: 'Lato';
-    font-weight: 200;
-    font-style: normal;
-    src: url('../fonts/lato-lig-eot.eot');
-    src: url('../fonts/lato-lig-eot.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/lato-lig-woff.woff') format('woff'),
-         url('../fonts/lato-lig-ttf.ttf') format('truetype'),
-         url('../fonts/lato-lig-svg.svg#latolight') format('svg');
-}
-
-@font-face {
-    font-family: 'Lato';
-    font-weight: 200;
-    font-style: italic;
-    src: url('../fonts/lato-ligita-eot.eot');
-    src: url('../fonts/lato-ligita-eot.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/lato-ligita-woff.woff') format('woff'),
-         url('../fonts/lato-ligita-ttf.ttf') format('truetype'),
-         url('../fonts/lato-ligita-svg.svg#latolight_italic') format('svg');
-}
-
-@font-face {
-    font-family: 'Lato';
-    font-weight: 400;
-    font-style: normal;
-    src: url('../fonts/lato-reg-eot.eot');
-    src: url('../fonts/lato-reg-eot.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/lato-reg-woff.woff') format('woff'),
-         url('../fonts/lato-reg-ttf.ttf') format('truetype'),
-         url('../fonts/lato-reg-svg.svg#latoregular') format('svg');
-}
-
-@font-face {
-    font-family: 'Lato';
-    font-weight: 400;
-    font-style: italic;
-    src: url('../fonts/lato-regita-eot.eot');
-    src: url('../fonts/lato-regita-eot.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/lato-regita-woff.woff') format('woff'),
-         url('../fonts/lato-regita-ttf.ttf') format('truetype'),
-         url('../fonts/lato-regita-svg.svg#latoitalic') format('svg');
-}

@@ -3,12 +3,46 @@ 
 @import "_bootstrap.scss";
 @import "_vendor.scss";
 @import "_coderay.scss";
+@import "_github.scss";
 @import "_font-awesome.scss";
-//@import "_lato.scss";
 
-@import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono|Ubuntu:300,300,400,300italic,400italic);
+/* Bootstrap Overrides */
 
-/* Bootstrap Overrides */
+@media (min-width: 768px) {
+  body {
+    padding-top: 60px;
+  }
+}
+
+@media ( max-width : 767px) {
+  .nav-container {
+    padding: 0;
+  }
+  .navbar-fixed-top {
+    position: relative;
+  }
+}
+
+.navbar {
+  background: #2b3033;
+  .nav {
+    background: #2b3033;
+  }
+  .nav a:hover {
+    background: #2b3033;
+  }
+  .navbar-toggle {
+    border-color: #555;
+  }
+  .icon-bar {
+    background: #555;
+  }
+
+  h1 {
+    margin: 0;
+    padding: 0;
+  }
+}
 
 body, h1, h2, h3, h4, h5, h6 {
   font-family: "Ubuntu", sans-serif;

@@ -1,23 +0,0 @@ 
-#!/bin/bash
-# $1: the file name (without extension)
-# $2: the json feed to download
-#
-# Feeds:
-# http://github.com/api/v2/json/commits/list/h3rald/concatenative/master 
-# http://github.com/api/v2/json/commits/list/h3rald/redbook/master 
-# http://github.com/api/v2/json/commits/list/h3rald/glyph/master 
-# http://github.com/api/v2/json/commits/list/h3rald/stash/master 
-# http://github.com/api/v2/json/commits/list/h3rald/rawline/master 
-# http://github.com/api/v2/json/commits/list/h3rald/h3rald/master 
-# http://api.backtype.com/user/h3rald/comments.json?key=47bf0031e3a18a598b85&html=1
-# http://twitter.com/status/user_timeline/h3rald.json
-# http://feeds.delicious.com/v2/json/h3rald
-
-current_dir=$(cd `dirname $0` && pwd)
-data=$current_dir/output/data
-
-mkdir -p $current_dir/tmp
-
-wget -q -O $data/tmp/$1.json $2 || rm $data/tmp/$1.json
-
-cp $data/tmp/$1.json $data/$1.json

@@ -37,15 +37,14 @@ <link rel="shortcut icon" href="/favicon.png" type="image/png" />
 		<meta content="44.388041;9.073248" name="ICBM" />
 
 		<link rel="stylesheet" type="text/css" href="/styles/bootstrap.css" />
-		<link rel="stylesheet" type="text/css" href="/styles/github.css" />
 		<link rel="stylesheet" type="text/css" href="/styles/style.css" />
     <!--[if lt IE 9]>
     <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
     <script src="https://www.google.com/jsapi?key=ABQIAAAAr6RY1Z6dchG_sX9WDLSy3xRlq2n1sm52B5HDRR5tm6o8XM18FhR56xHNNH6CsX86uN5VoTrglpyOyQ" type="text/javascript"></script>
+    <script src="https://code.jquery.com/jquery-latest.js" type="text/javascript"></script>
     <script src="/js/sevenup.js" type="text/javascript"></script>
     <script src="/js/sevenup_black.js" type="text/javascript"></script>
-    <script src="https://code.jquery.com/jquery-latest.js" type="text/javascript"></script>
     <script src="/js/jquery-timeago.js" type="text/javascript"></script>
     <script src="/js/date.js" type="text/javascript"></script>
     <script src="/js/hyphenator.js" type="text/javascript"></script>

@@ -9,42 +9,44 @@ else
       ""
     end
   end
-%><div class="container">
-  <div class="row" id="header-row">
-    <div class="col-md-6 main-title">
-      <h1>
-        <% if @item[:permalink] != 'home' then %>
-        <a href="/"><img src="/img/h3rald.png" alt="H3RALD" /></a>
-      <% else %>
-        <img src="/img/h3rald.png" alt="H3RALD" />
-      <% end %>
-      </h1>
-    </div>
-    <div class="col-md-4 col-md-offset-2">
-      <div class="gcse-searchbox" data-enableAutoComplete="true"></div>
+%><div class="container nav-container">
+  <div id="main-navbar" class="navbar navbar-fixed-top" role="navigation">
+    <div class="container">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <h1 class="navbar-brand">
+          <% if @item[:permalink] != 'home' then %>
+          <a href="/"><img src="/images/h3rald.png" alt="H3RALD" /></a>
+        <% else %>
+          <img src="/images/h3rald.png" alt="H3RALD" />
+        <% end %>
+        </h1>
+      </div>
+      <div class="navbar-collapse collapse">
+        <ul class="nav navbar-nav">
+          <li<%=active_if("home")%>><a href="/"><i class="fa fa-home"></i> HOME</a></li>
+          <li<%=active_if("projects")%>><a href="/projects/"><i class="fa fa-briefcase"></i> PROJECTS</a></li>
+          <li<%=active_if("tags")%>><a href="/tags/"><i class="fa fa-tags"></i> TAGS</a></li>
+          <li<%=active_if("archives")%>><a href="/archives/"><i class="fa fa-archive"></i> ARCHIVES</a></li>
+          <li<%=active_if("about")%>><a href="/about/"><i class="fa fa-question-circle"></i> ABOUT</a></li>
+          <!-- <li<%=active_if("contact")%>><a href="/contact/"><i class="fa fa-envelope"></i> CONTACT</a></li> -->
+        </ul>
+        <!--
+        <div class="navbar-form navbar-nav navbar-right">
+          <div class="gcse-searchbox" data-enableAutoComplete="true"></div>
+        </div>
+        -->
+      </div>
     </div>
   </div>
+  <div class="row" id="header-row">
+  </div>
   <div id="search_results">
     <div class="gcse-searchresults" data-linkTarget="_top"></div>
   </div> 
-  <div id="main-navbar" class="navbar navbar-inverse" role="navigation">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-    </div>
-    <div class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <li<%=active_if("home")%>><a href="/"><i class="fa fa-home"></i> HOME</a></li>
-        <li<%=active_if("projects")%>><a href="/projects/"><i class="fa fa-briefcase"></i> PROJECTS</a></li>
-        <li<%=active_if("tags")%>><a href="/tags/"><i class="fa fa-tags"></i> TAGS</a></li>
-        <li<%=active_if("archives")%>><a href="/archives/"><i class="fa fa-archive"></i> ARCHIVES</a></li>
-        <li<%=active_if("about")%>><a href="/about/"><i class="fa fa-question-circle"></i> ABOUT</a></li>
-        <li<%=active_if("contact")%>><a href="/contact/"><i class="fa fa-envelope"></i> CONTACT</a></li>
-      </ul>
-    </div>
-  </div>
 </div>