From cc2c3863b0a3ec26e6610163c00b5f8f6aedc716 Mon Sep 17 00:00:00 2001
From: Andrew Lee <alee14498@gmail.com>
Date: Fri, 2 Aug 2019 15:35:14 -0400
Subject: About page, updated 404 and changed style

---
 views/includes/footer.ejs |  9 ++++++++-
 views/includes/header.ejs | 10 +++++++---
 views/includes/navbar.ejs | 31 +++++++++++++++++++++----------
 3 files changed, 36 insertions(+), 14 deletions(-)

(limited to 'views/includes')

diff --git a/views/includes/footer.ejs b/views/includes/footer.ejs
index 8a666f5..56a654c 100644
--- a/views/includes/footer.ejs
+++ b/views/includes/footer.ejs
@@ -1 +1,8 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
\ No newline at end of file
+<!-- JQuery -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<!-- Bootstrap tooltips -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.4/umd/popper.min.js"></script>
+<!-- Bootstrap core JavaScript -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js"></script>
+<!-- MDB core JavaScript -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.8.7/js/mdb.min.js"></script>
\ No newline at end of file
diff --git a/views/includes/header.ejs b/views/includes/header.ejs
index 268e2d4..9f47fb4 100644
--- a/views/includes/header.ejs
+++ b/views/includes/header.ejs
@@ -1,3 +1,7 @@
-<link href="https://fonts.googleapis.com/css?family=Play:400,700&display=swap" rel="stylesheet"> 
-<link rel="stylesheet" href="/css/style.css">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
\ No newline at end of file
+<!-- Font Awesome -->
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
+<!-- Bootstrap core CSS -->
+<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+<!-- Material Design Bootstrap -->
+<link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.8.7/css/mdb.min.css" rel="stylesheet"><link href="https://fonts.googleapis.com/css?family=Play:400,700&display=swap" rel="stylesheet"> 
+<link rel="stylesheet" href="/css/style.css">
\ No newline at end of file
diff --git a/views/includes/navbar.ejs b/views/includes/navbar.ejs
index 634ee5a..ed2e826 100644
--- a/views/includes/navbar.ejs
+++ b/views/includes/navbar.ejs
@@ -1,12 +1,23 @@
-<div class="navbar-fixed">
-<nav>
-    <div class="nav-wrapper black">
-        <a href="/" class="brand-logo">Alee Productions</a>
-        <ul id="nav-mobile" class="right hide-on-med-and-down">
-            <li><a href="/projects">Projects</a></li>
-            <li><a href="/blog">Blog</a></li>
-            <li><a href="/about">About</a></li>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+    <a class="navbar-brand" href="/">Alee Productions</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
+        aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarNav">
+        <ul class="navbar-nav">
+            <li class="nav-item">
+                <a class="nav-link" href="/">Home</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/projects">Projects</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/blog">Blog</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/about">About</a>
+            </li>
         </ul>
     </div>
-</nav>
-</div>
\ No newline at end of file
+</nav>
\ No newline at end of file
-- 
cgit v1.2.3