Update top-level navbar to include Workshops and Outreach (#94)

* Update projects.php blurb and link to docs * Put Workshops and Outreach in top-level navbar
UCLA-IEEE · Dec 30, 2023 · 3984a93 · 3984a93
1 parent 880c290
commit 3984a93
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 33 deletions.
diff --git a/public/css/navbar.css b/public/css/navbar.css
@@ -156,7 +156,8 @@
   transition: 0.3s ease;
 }
 
-@media (max-width: 1015px) {
+/* 1150 px is the approximate width of the navbar */
+@media (max-width: 1150px) {
   .navbar-icon {
     display: inline-block;
   }

diff --git a/views/about.php b/views/about.php
@@ -32,7 +32,7 @@
 
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
     <link rel="stylesheet" href="/public/css/about.css?v=1.0.0?v=1.0.0" />
 

diff --git a/views/blog.php b/views/blog.php
@@ -32,7 +32,7 @@
 
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
     <link rel="stylesheet" href="/public/css/blog.css?v=1.0.0" />
 

diff --git a/views/edi.php b/views/edi.php
@@ -32,7 +32,7 @@
 
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
     <link rel="stylesheet" href="/public/css/edi.css?v=1.0.0?v=1.0.0" />
   </head>

diff --git a/views/error/error-template.php b/views/error/error-template.php
@@ -31,7 +31,7 @@
     <link
       rel="stylesheet"
       type="text/css"
-      href="/public/css/navbar.css?v=2023.12"
+      href="/public/css/navbar.css?v=2023.12.1"
     />
     <link
       rel="stylesheet"

diff --git a/views/includes/navbar.html b/views/includes/navbar.html
@@ -9,44 +9,33 @@
     <div class="bar3"></div>
   </div>
   <ul class="nav-list">
+    <li><a href="/projects">Projects</a></li>
+    <li><a href="/workshops">Workshops</a></li>
+    <li><a href="/outreach">Outreach</a></li>
+    <li><a href="/lab">Lab</a></li>
     <div class="dropdown">
       <li><a href="/about">About</a></li>
       <div class="dropdown-content">
         <li><a href="/officers">Officers</a></li>
+        <li><a href="/sponsors">Sponsors</a></li>
       </div>
     </div>
-    <div class="dropdown">
-      <li><a href="/projects">Projects</a></li>
-      <div class="dropdown-content">
-        <li><a href="/workshops">Workshops</a></li>
-        <li><a href="/outreach">Outreach</a></li>
-      </div>
-    </div>
-    <li><a href="/lab">Lab</a></li>
-    <li><a href="/sponsors">Sponsors</a></li>
   </ul>
 </div>
 <ul class="mobile-nav-list">
+  <li><a href="/projects">Projects</a></li>
+  <li><a href="/workshops">Workshops</a></li>
+  <li><a href="/outreach">Outreach</a></li>
+  <li><a href="/lab">Lab</a></li>
   <div class="responsive-dropdown">
     <li>
       <a href="/about">About</a>
       <span class="glyphicon glyphicon-chevron-down dropdown-arrow"></span>
     </li>
     <div class="responsive-dropdown-content">
       <li><a href="/officers">Officers</a></li>
+      <li><a href="/sponsors">Sponsors</a></li>
     </div>
   </div>
-  <div class="responsive-dropdown">
-    <li>
-      <a href="/projects">Projects</a>
-      <span class="glyphicon glyphicon-chevron-down dropdown-arrow"></span>
-    </li>
-    <div class="responsive-dropdown-content">
-      <li><a href="/workshops">Workshops</a></li>
-      <li><a href="/outreach">Outreach</a></li>
-    </div>
-  </div>
-  <li><a href="/lab">Lab</a></li>
-  <li><a href="/sponsors">Sponsors</a></li>
 </ul>
 <script src="../../public/js/navbar.js?v=2023.12"></script>
diff --git a/views/lab.php b/views/lab.php
@@ -31,7 +31,7 @@
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
     <link rel="stylesheet" href="/public/css/lab.css?v=1.3.3" />
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
 
     <!-- SCRIPTS -->
     <script src="/public/js/key.js"></script>

diff --git a/views/main.php b/views/main.php
@@ -30,7 +30,7 @@
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/lab.css?v=1.2.2" />
     <link rel="stylesheet" href="/public/css/main.css?v=1.2.0" />
 

diff --git a/views/officers.php b/views/officers.php
@@ -285,7 +285,7 @@
 
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
     <link rel="stylesheet" href="/public/css/officers.css?v=1.0.1" />
 

diff --git a/views/outreach.php b/views/outreach.php
@@ -32,7 +32,7 @@
 
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.1" />
     <link rel="stylesheet" href="/public/css/outreach.css?v=1.0.0" />
 

diff --git a/views/projects.php b/views/projects.php
@@ -29,7 +29,7 @@
 
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/projects.css?v=1.1.1" />
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
 

diff --git a/views/sponsors.php b/views/sponsors.php
@@ -40,7 +40,7 @@
     <link
       rel="stylesheet"
       type="text/css"
-      href="/public/css/navbar.css?v=2023.12"
+      href="/public/css/navbar.css?v=2023.12.1"
     />
 
     <!--Favicon -->

diff --git a/views/workshops.php b/views/workshops.php
@@ -30,7 +30,7 @@
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="/public/css/style.css?v=1.0.0" />
     <link rel="stylesheet" href="/public/css/footer.css?v=1.0.0" />
-    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12" />
+    <link rel="stylesheet" href="/public/css/navbar.css?v=2023.12.1" />
     <link rel="stylesheet" href="/public/css/workshops.css?v=2.0.0" />
 
     <!--Favicon -->