From 38a89a7dcb77160bd2fdbcaa5e28b31dc19f1102 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Tue, 5 Jan 2016 14:11:26 +0000
Subject: [PATCH] Added navbar HTML component

---
 static/src/js/app.js        | 4 ++--
 static/src/less/navbar.less | 4 ++++
 templates/about/me.html     | 1 -
 templates/content_base.html | 2 +-
 templates/index.html        | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/static/src/js/app.js b/static/src/js/app.js
index fbe8b45..617e092 100644
--- a/static/src/js/app.js
+++ b/static/src/js/app.js
@@ -13,6 +13,6 @@ if ($('body').hasClass('index')) {  // Render components on index
   React.render(<ProjectImagesMain />, document.getElementById('project-images-main'));
 }
 
-if ($('#navbar-test')) {
-  React.render(<NavBar />, document.getElementById('navbar-test'));
+if ($('navbar')) {
+  React.render(<NavBar />, $('navbar')[0]);
 }
diff --git a/static/src/less/navbar.less b/static/src/less/navbar.less
index dc1bbfa..49f3440 100644
--- a/static/src/less/navbar.less
+++ b/static/src/less/navbar.less
@@ -96,3 +96,7 @@
   top: 0;
   z-index: 10000;
 }
+
+navbar + * {
+  margin-top: 52px;
+}
diff --git a/templates/about/me.html b/templates/about/me.html
index 9577aa0..eebf223 100644
--- a/templates/about/me.html
+++ b/templates/about/me.html
@@ -23,6 +23,5 @@
   </div>
 </div>
 
-<div id="navbar-test"></div>
 <script async defer src="//cdn.jsdelivr.net/github-cards/latest/widget.js"></script>
 {% endblock %}
diff --git a/templates/content_base.html b/templates/content_base.html
index 80644e5..1aa9f18 100644
--- a/templates/content_base.html
+++ b/templates/content_base.html
@@ -9,7 +9,7 @@
     <div class="container">
       <h1>{% block pageTitle %}{% endblock %}</h1>
     </div>
+    <navbar></navbar>
   </div>
   {% block content %}{% endblock %}
 {% endblock %}
-
diff --git a/templates/index.html b/templates/index.html
index 8f6f22a..c0dd176 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -35,6 +35,6 @@
     <script>
       !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
     </script>
-
+    <navbar></navbar>
     <div class="container-fluid" id="project-images-main"></div>
 {% endblock %}