Merge pull request #56 from uclaacm/andy-about

Remove about page from navbar, and make Committees unclickable
uclaacm · Nov 14, 2020 · 8f0a76e · 8f0a76e
2 parents ab9e48a + 2985db3
commit 8f0a76e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -3,34 +3,36 @@
         <a href="{{ site.baseurl }}/">{% include 'ucla-acm-logo.svg' %}</a>
     </div>
     <div class="links">
-    {% for node in collections.nav %}
+        {% for node in collections.nav %}
         {% if node.data.title == "Committees" %}
 
-            <div class="navigation-committee">
-                {% if page.url == node.url %}
-                    <div class ="dropbtn"><a href="{{{{ node.url | prepend: site.baseurl }}" class="active">{{ node.data.title }}</a></div>
+        <div class="navigation-committee">
+            {% if page.url == node.url %}
+            <div class="dropbtn">{{ node.data.title }}</div>
+            {% else %}
+            <div class="dropbtn">{{ node.data.title }}</div>
+            {% endif %}
+            <div id="dropdown" class="dropdown-content">
+                {% for committee in committees %}
+                <script>console.log("{{ committee.filename }}")</script>
+                {% if page.url contains committee.filename %}
+                <a href="{{ site.baseurl }}/committees/{{ committee.filename }}/"
+                    class="active-{{ committee.filename | downcase}}">{{ committee.title }}</a>
                 {% else %}
-                    <div class ="dropbtn"><a href="{{{{ node.url | prepend: site.baseurl }}" class="not-active">{{ node.data.title }}</a></div>
+                <a href="{{ site.baseurl }}/committees/{{ committee.filename }}/"
+                    class="committee-not-active">{{ committee.title }}</a>
                 {% endif %}
-                <div id="dropdown" class="dropdown-content">
-                    {% for committee in committees %}
-                        <script>console.log("{{ committee.filename }}")</script>
-                        {% if page.url contains committee.filename %}
-                            <a href="{{ site.baseurl }}/committees/{{ committee.filename }}/" class="active-{{ committee.filename | downcase}}">{{ committee.title }}</a>
-                        {% else %}
-                            <a href="{{ site.baseurl }}/committees/{{ committee.filename }}/"  class="committee-not-active">{{ committee.title }}</a>
-                        {% endif %}
-                    {% endfor %}
-                </div>
+                {% endfor %}
             </div>
-
+        </div>
+
         {% else %}
-            {% if page.url == node.url %}
-                <a href="{{{{ node.url | prepend: site.baseurl }}" class="active">{{ node.data.title }}</a>
+        {% if page.url == node.url %}
+        <a href="{{{{ node.url | prepend: site.baseurl }}" class="active">{{ node.data.title }}</a>
             {% else %}
                 <a href="{{{{ node.url | prepend: site.baseurl }}" class="not-active">{{ node.data.title }}</a>
             {% endif %}
         {% endif %}
     {% endfor %}
     </div>
-</nav>
+</nav>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -10,7 +10,7 @@
 {%- endif -%}
 
 <!DOCTYPE HTML>
-<html>
+<html style="overflow-x: hidden;">
     <head>
         <meta charset="utf-8">
         <meta name="description" content="{{ desc }}">

diff --git a/_pages/02_about.md b/_pages/02_about.md
@@ -2,7 +2,6 @@
 layout: page
 title: About
 permalink: "/about/"
-tags: nav
 date: 2000-01-01
 ---
 

diff --git a/_sass/_header.scss b/_sass/_header.scss
@@ -71,6 +71,7 @@
     }
   }
   &:hover .dropdown-content {display: block;}
+  &:active .dropdown-content {display: block;}
 }
 
 /* 'acm at UCLA' logo */

diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -163,7 +163,6 @@ body {
   }
 
   .image-full-width {
-    height: 45rem;
     object-fit: cover;
     width: 100vw;
     position: relative;

diff --git a/css/master.css b/css/master.css
@@ -136,7 +136,6 @@ body {
     max-width: 150px;
     margin: 0 auto; }
   .content-body .image-full-width {
-    height: 45rem;
     object-fit: cover;
     width: 100vw;
     position: relative;
@@ -738,6 +737,8 @@ body {
         opacity: 0.7; }
   .navigation-committee:hover .dropdown-content {
     display: block; }
+  .navigation-committee:active .dropdown-content {
+    display: block; }
 
 /* 'acm at UCLA' logo */
 .navigation-home {