ubyssey · brittkhat · Aug 17, 2023 · Aug 17, 2023 · Aug 17, 2023 · Aug 17, 2023
diff --git a/article/templates/article/article_page_visual_essay.html b/article/templates/article/article_page_visual_essay.html
@@ -1,6 +1,5 @@
 {% extends 'article/article_page.html' %}
 {% load static %}
-{% load dispatch_tags %}
 {% load wagtailimages_tags %}
 
 {% block head_scripts %}
@@ -92,7 +91,6 @@ <h1 class="headline">{{ self.title|safe }}</h1>
 {% block right-column %}
  <div class="right-column">
  <div class="sidebar">
- {% zone 'article-sidebar' %}
  {% if explicit is not True %}
  {% if self.minutes_to_read >= 3 %}
  {% include 'objects/advertisement.html' with size='skyscraper' name='Box_A' id=3 article=article.id %}

diff --git a/navigation/templates/navigation/headers/main.html b/navigation/templates/navigation/headers/main.html
@@ -39,6 +39,14 @@
  <div class="middle">
  <ul class="sections">
  {% main_menu %}
+ <li class="dropdown">
+ <a class="more-dropdown preventDefault" href="#">MORE <i class="dropdown-hidden fa-solid fa-caret-down"></i><i class="dropdown-show fa-solid fa-caret-up"></i></a>
+ <div class="more-list dropdown-content">
+ <ul>
+ {% flat_menu 'dropdown_menu' max_levels=1 show_menu_heading=False fall_back_to_default_site_menus=True %}
+ </ul>
+ </div>
+ </li>
  </ul>
  </div>
  <div class="right">

diff --git a/ubyssey/static_src/src/js/main.js b/ubyssey/static_src/src/js/main.js
@@ -11,7 +11,9 @@ import upcomingEvents from './widgets/upcoming-events';
  initializeSearchFormActions();
  initializeSocialMediaActions();
 
- initializeAudioQuote()
+ initializePreventDefault();
+
+ initializeAudioQuote();
 
  initializeFilterDropdown();
 
@@ -286,6 +288,12 @@ function initializeSocialMediaActions() {
 
 }
 
+function initializePreventDefault() {
+ $('.preventDefault').click(function (e) {
+ e.preventDefault();
+ });
+}
+
 function initializeAudioQuote() {
  $(document).on('click', 'a.playAudioQuote', function (e) {
  e.preventDefault();

diff --git a/ubyssey/static_src/src/styles/main.scss b/ubyssey/static_src/src/styles/main.scss
@@ -226,6 +226,31 @@ a.image {
  }
 }
 
+.dropdown {
+ position: relative;
+}
+
+.dropdown-content {
+ display: none;
+ position: absolute;
+}
+
+.dropdown-show {
+ display: none;
+}
+
+.dropdown:focus-within, .dropdown:hover {
+ .dropdown-content {
+ display: block; 
+ }
+ .dropdown-show {
+ display: inherit; 
+ }
+ .dropdown-hidden {
+ display: none;
+ }
+}
+
 .hide {
  display: none;
 }

diff --git a/ubyssey/static_src/src/styles/modules/_core.scss b/ubyssey/static_src/src/styles/modules/_core.scss
@@ -84,7 +84,7 @@ main {
 // ROWS AND COLUMNS
 
 .row {
- overflow: auto;
+ //overflow: auto;
  > .left {
  float: left;
  }

diff --git a/ubyssey/static_src/src/styles/modules/_header.scss b/ubyssey/static_src/src/styles/modules/_header.scss
@@ -54,7 +54,7 @@ header.main{
  height: 50px;
  display: grid;
  grid-template-columns: 1fr auto 1fr;
- overflow: hidden;
+ //overflow: hidden;
 
  .left, .middle, .right {
  display: inline-block;
@@ -117,13 +117,6 @@ header.main{
  }
  }
 
- .middle {
- ul {
- gap: 2px;
- background-color: var(--header_color);
- }
- }
-
  ul {
  list-style-type: none;
  padding: 0;
@@ -142,17 +135,48 @@ header.main{
  font-weight: $font-weight-semi-bold;
  color: var(--header_color);
  text-transform: uppercase;
- background-color: var(--background);
+ margin: 0;
  padding-left: 10px;
  padding-right: 10px;
+ border-right: 2px solid;
  line-height: 2em;
- margin: 0;
  transition: background 0.5s ease, color 0.5s ease;
 
+ &:last-child {
+ border-right: none;
+ }
+
  &.elections a {
  color: $color-red;
  } 
  }
+ .dropdown {
+ border-left: 2px solid;
+ }
+ .dropdown:focus-within, .dropdown:hover {
+ text-decoration: underline;
+ }
+ .more-dropdown {
+ white-space: nowrap;
+ }
+ .more-list {
+ background-color: var(--background);
+ padding: 2px;
+ border: 2px solid;
+ border-top: none;
+ left: -2px;
+ text-decoration: underline;
+ z-index: 100;
+
+ ul {
+ display: block;
+ li {
+ display: block;
+ border: none;
+ text-align: left;
+ }
+ }
+ }
  }
 
  &.sections-more {

diff --git a/ubyssey/templates/advertise/index.html b/ubyssey/templates/advertise/index.html
@@ -1,5 +1,4 @@
 {% load static %}
-{% load dispatch_tags %}
 <!DOCTYPE html>
 <html>
 <head>

diff --git a/ubyssey/templates/article/food-insecurity.html b/ubyssey/templates/article/food-insecurity.html
@@ -1,5 +1,4 @@
 {% load static %}
-{% load dispatch_tags %}
 <!DOCTYPE html>
 <html>
  <head>

diff --git a/ubyssey/templates/article/isolation-first-article.html b/ubyssey/templates/article/isolation-first-article.html
@@ -1,6 +1,5 @@
 {% extends 'article/default.html' %}
 {% load static %}
-{% load dispatch_tags %}
 
 {% block stylesheet %}
  <link rel="stylesheet" href="{% static 'ubyssey/css/isolation.css' %}" type="text/css"/>

diff --git a/ubyssey/templates/article/isolation-last-article.html b/ubyssey/templates/article/isolation-last-article.html
@@ -1,6 +1,5 @@
 {% extends 'article/default.html' %}
 {% load static %}
-{% load dispatch_tags %}
 
 {% block stylesheet %}
  <link rel="stylesheet" href="{% static 'ubyssey/css/isolation.css' %}" type="text/css"/>

diff --git a/ubyssey/templates/article/isolation.html b/ubyssey/templates/article/isolation.html
@@ -1,6 +1,5 @@
 {% extends 'article/default.html' %}
 {% load static %}
-{% load dispatch_tags %}
 
 {% block stylesheet %}
  <link rel="stylesheet" href="{% static 'ubyssey/css/isolation.css' %}" type="text/css"/>

diff --git a/ubyssey/templates/article/magazine-poem.html b/ubyssey/templates/article/magazine-poem.html
@@ -1,5 +1,4 @@
 {% extends 'magazine/base.html' %}
-{% load dispatch_tags %}
 
 {% block css %}
  {% load static %}