navBar Height and Font (#252)

Co-authored-by: Ryan Birmingham <birm@rbirm.us> Co-authored-by: Nan Li <linanldj@gmail.com>
camicroscope · Mar 26, 2020 · 7439bed · 7439bed
1 parent 7488a68
commit 7439bed
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 11 deletions.
diff --git a/apps/landing/landing.html b/apps/landing/landing.html
@@ -6,14 +6,22 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" href="./main.css" />
     <link rel="shortcut icon" type="image/x-icon" href="favicon.png">
+    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
+		integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
+		crossorigin="anonymous"></script>
+	<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
+		integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
+		crossorigin="anonymous"></script>
+	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
+		integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
 </head>
 <body>
 
 
 
 <!-- Header -->
 
-<header id="header" >
+<!-- <header id="header" >
     <nav id= "nav" class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky;">
         <button style="display:none;" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
 			<span class="navbar-toggler-icon"></span>
@@ -28,8 +36,31 @@
 
     </nav>
 
-</header>
-
+</header> -->
+
+<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;">
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarCollapse" >
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item active link" style="font-family: sans-serif;">
+                <a class="nav-link" href="landing.html">Home</a>
+            </li>
+            <li class="nav-item  link" style="font-family: sans-serif;">
+                <a class="nav-link" href="../table.html">Slides</a>
+            </li>
+        </ul>
+        <ul class="navbar-nav">
+            <li class="nav-item link" style="font-family: sans-serif;">
+                <a class="nav-link" href="../signup/signup.html">Signup</a>
+            </li>
+            <li class="nav-item link" style="font-family: sans-serif;">
+                <a class="nav-link" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform">Feedback</a>
+            </li>
+        </ul>
+    </div>
+</nav>
 
 
 <!-- Main -->

diff --git a/apps/landing/main.css b/apps/landing/main.css
@@ -18,7 +18,7 @@
 		vertical-align: baseline;
 	}
 
-	article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
+	article, aside, details, figcaption, figure, footer, hgroup, menu, nav, section {
 		display: block;
 	}
 
@@ -4714,15 +4714,15 @@
 
 		}
 		.link{
+			letter-spacing: 0.02em;
 			text-transform: uppercase;
-			font-size: 1em;
-			font-weight: 600;
+			font-size: 0.99em;
+			font-weight: bold;
 			color: #5e6875;
-			text-decoration-line: none;
-			text-decoration-style: solid;
-			text-decoration-color: currentcolor;
-			text-decoration-thickness: auto;
+			text-decoration:none;
 			padding-right: 0.7rem;
 			padding-left: 0.7rem;
+			margin-top: 0.2rem;
 			font-family: "Open Sans", Helvetica, sans-serif;
-		}
+			line-height: 1.8;
+		}
diff --git a/apps/table.html b/apps/table.html
@@ -72,6 +72,9 @@
 				</li>
 			</ul>
 			<ul class="navbar-nav">
+				<li class="nav-item link" style="font-family: sans-serif;">
+					<a class="nav-link" href="./signup/signup.html">Signup</a>
+				</li>
 				<li class="nav-item link">
 					<a class="nav-link" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform">Feedback</a>
 				</li>