From 05d8c11e7bf1dd4c19f62ddc30e39fba7dd93fd1 Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Fri, 14 Feb 2020 23:53:28 -0500
Subject: [PATCH] Reorganize Branding

- Move favicon, logos, and branding to "Branding" folder
---
 Assets/{ => Branding}/favicon.ico        | Bin
 Assets/{ => Branding}/logo.png           | Bin
 Assets/{ => Branding}/logo_with_name.png | Bin
 Assets/{ => Branding}/name.png           | Bin
 Web Pages/Common/header.html             |   2 +-
 Web Pages/Common/header.txt              |   2 +-
 Web Pages/Common/navbar.html             |   6 +++---
 Web Pages/Common/navbar.txt              |   2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename Assets/{ => Branding}/favicon.ico (100%)
 rename Assets/{ => Branding}/logo.png (100%)
 rename Assets/{ => Branding}/logo_with_name.png (100%)
 rename Assets/{ => Branding}/name.png (100%)

diff --git a/Assets/favicon.ico b/Assets/Branding/favicon.ico
similarity index 100%
rename from Assets/favicon.ico
rename to Assets/Branding/favicon.ico
diff --git a/Assets/logo.png b/Assets/Branding/logo.png
similarity index 100%
rename from Assets/logo.png
rename to Assets/Branding/logo.png
diff --git a/Assets/logo_with_name.png b/Assets/Branding/logo_with_name.png
similarity index 100%
rename from Assets/logo_with_name.png
rename to Assets/Branding/logo_with_name.png
diff --git a/Assets/name.png b/Assets/Branding/name.png
similarity index 100%
rename from Assets/name.png
rename to Assets/Branding/name.png
diff --git a/Web Pages/Common/header.html b/Web Pages/Common/header.html
index 829c5d8..776cbe2 100644
--- a/Web Pages/Common/header.html	
+++ b/Web Pages/Common/header.html	
@@ -19,4 +19,4 @@
 <link rel="stylesheet" type="text/css" href="styles.css"/>
 
 <!-- Favicon -->
-<link rel="icon" href="../Assets/favicon.ico" type="image/x-icon"/>
\ No newline at end of file
+<link rel="icon" href="../Assets/Branding/favicon.ico" type="image/x-icon"/>
\ No newline at end of file
diff --git a/Web Pages/Common/header.txt b/Web Pages/Common/header.txt
index cf0547f..999f834 100644
--- a/Web Pages/Common/header.txt	
+++ b/Web Pages/Common/header.txt	
@@ -1 +1 @@
-document.write('<!--Required meta tags--> <meta charset="utf-8"> <meta name="author" content="Sravan Balaji"> <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Latest compiled and minified CSS --> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"> <!-- jQuery library --> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <!-- Popper JS --> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script> <!-- Latest compiled JavaScript --> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script> <!-- Stylesheet --> <link rel="stylesheet" type="text/css" href="styles.css"/> <!-- Favicon --> <link rel="icon" href="../Assets/favicon.ico" type="image/x-icon"/>')
\ No newline at end of file
+document.write('<!--Required meta tags--> <meta charset="utf-8"> <meta name="author" content="Sravan Balaji"> <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Latest compiled and minified CSS --> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"> <!-- jQuery library --> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <!-- Popper JS --> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script> <!-- Latest compiled JavaScript --> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script> <!-- Stylesheet --> <link rel="stylesheet" type="text/css" href="styles.css"/> <!-- Favicon --> <link rel="icon" href="../Assets/Branding/favicon.ico" type="image/x-icon"/>')
\ No newline at end of file
diff --git a/Web Pages/Common/navbar.html b/Web Pages/Common/navbar.html
index dab461e..2938cc9 100644
--- a/Web Pages/Common/navbar.html	
+++ b/Web Pages/Common/navbar.html	
@@ -1,8 +1,8 @@
-<nav class="navbar navbar-expand-md bg-dark navbar-dark fixed-top">
+<nav class="navbar my-nav navbar-expand-md fixed-top">
     <!-- Brand -->
     <a class="navbar-brand" href="index.html">
-        <img src="../Assets/logo.png" alt="Icon" width="30px" height="30px" class="d-inline-block align-top">
-        <img src="../Assets/name.png" alt="Name" height="30px" class="d-inline-block align-center">
+        <img src="../Assets/Branding/logo.png" alt="Icon" width="30px" height="30px" class="d-inline-block align-top">
+        <img src="../Assets/Branding/name.png" alt="Name" height="30px" class="d-inline-block align-center">
     </a>
     
     <!-- Toggler/collapsibe Button -->
diff --git a/Web Pages/Common/navbar.txt b/Web Pages/Common/navbar.txt
index 219e1ea..fdc09af 100644
--- a/Web Pages/Common/navbar.txt	
+++ b/Web Pages/Common/navbar.txt	
@@ -1 +1 @@
-document.write('<nav class="navbar navbar-expand-md bg-dark navbar-dark fixed-top"> <!-- Brand --> <a class="navbar-brand" href="index.html"> <img src="../Assets/logo.png" alt="Icon" width="30px" height="30px" class="d-inline-block align-top"> <img src="../Assets/name.png" alt="Name" height="30px" class="d-inline-block align-center"> </a> <!-- Toggler/collapsibe Button --> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar"> <span class="navbar-toggler-icon"></span> </button> <!-- Navbar links --> <div class="collapse navbar-collapse" id="collapsibleNavbar"> <ul class="navbar-nav"> <!-- About --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="about.html" id="navbardrop" data-toggle="dropdown"> About </a> <div class="dropdown-menu"> <a class="dropdown-item" href="about.html#bio"> Bio </a> <a class="dropdown-item" href="about.html#contact_me"> Contact Me </a> </div> </li> <!-- Portfolio --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="portfolio.html" id="navbardrop" data-toggle="dropdown"> Portfolio </a> <div class="dropdown-menu"> <a class="dropdown-item" href="portfolio.html#resume"> Resume </a> <a class="dropdown-item" href="portfolio.html#education"> Education </a> <a class="dropdown-item" href="portfolio.html#professional_experience"> Professional Experience </a> <!-- <a class="dropdown-item" href="portfolio.html#research"> Research </a> <a class="dropdown-item" href="portfolio.html#projects"> Projects </a> --> </div> </li> <!-- Personal --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="personal.html" id="navbardrop" data-toggle="dropdown"> Personal </a> <div class="dropdown-menu"> <a class="dropdown-item" href="personal.html#software"> Software </a> <a class="dropdown-item" href="personal.html#hardware"> Hardware </a> <a class="dropdown-item" href="personal.html#video_games"> Video Games </a> <a class="dropdown-item" href="personal.html#podcasts"> Podcasts </a> <a class="dropdown-item" href="personal.html#music"> Music </a> </div> </li> <!-- Documentation --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="documentation.html" id="navbardrop" data-toggle="dropdown"> Documentation </a> <div class="dropdown-menu"> <a class="dropdown-item" href="documentation.html#introduction"> Introduction </a> <a class="dropdown-item" href="documentation.html#website_hosting"> Website Hosting </a> <a class="dropdown-item" href="documentation.html#web_design"> Web Design </a> <a class="dropdown-item" href="documentation.html#aesthetics"> Aesthetics </a> <a class="dropdown-item" href="documentation.html#inspiration"> Inspiration </a> </div> </li> </ul> </div> </nav>')
\ No newline at end of file
+document.write('<nav class="navbar my-nav navbar-expand-md fixed-top"> <!-- Brand --> <a class="navbar-brand" href="index.html"> <img src="../Assets/Branding/logo.png" alt="Icon" width="30px" height="30px" class="d-inline-block align-top"> <img src="../Assets/Branding/name.png" alt="Name" height="30px" class="d-inline-block align-center"> </a> <!-- Toggler/collapsibe Button --> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar"> <span class="navbar-toggler-icon"></span> </button> <!-- Navbar links --> <div class="collapse navbar-collapse" id="collapsibleNavbar"> <ul class="navbar-nav"> <!-- About --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="about.html" id="navbardrop" data-toggle="dropdown"> About </a> <div class="dropdown-menu"> <a class="dropdown-item" href="about.html#bio"> Bio </a> <a class="dropdown-item" href="about.html#contact_me"> Contact Me </a> </div> </li> <!-- Portfolio --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="portfolio.html" id="navbardrop" data-toggle="dropdown"> Portfolio </a> <div class="dropdown-menu"> <a class="dropdown-item" href="portfolio.html#resume"> Resume </a> <a class="dropdown-item" href="portfolio.html#education"> Education </a> <a class="dropdown-item" href="portfolio.html#professional_experience"> Professional Experience </a> <!-- <a class="dropdown-item" href="portfolio.html#research"> Research </a> <a class="dropdown-item" href="portfolio.html#projects"> Projects </a> --> </div> </li> <!-- Personal --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="personal.html" id="navbardrop" data-toggle="dropdown"> Personal </a> <div class="dropdown-menu"> <a class="dropdown-item" href="personal.html#software"> Software </a> <a class="dropdown-item" href="personal.html#hardware"> Hardware </a> <a class="dropdown-item" href="personal.html#video_games"> Video Games </a> <a class="dropdown-item" href="personal.html#podcasts"> Podcasts </a> <a class="dropdown-item" href="personal.html#music"> Music </a> </div> </li> <!-- Documentation --> <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="documentation.html" id="navbardrop" data-toggle="dropdown"> Documentation </a> <div class="dropdown-menu"> <a class="dropdown-item" href="documentation.html#introduction"> Introduction </a> <a class="dropdown-item" href="documentation.html#website_hosting"> Website Hosting </a> <a class="dropdown-item" href="documentation.html#web_design"> Web Design </a> <a class="dropdown-item" href="documentation.html#aesthetics"> Aesthetics </a> <a class="dropdown-item" href="documentation.html#inspiration"> Inspiration </a> </div> </li> </ul> </div> </nav>')
\ No newline at end of file