From b71fbf04ce255bf0d0352c5c0e66f742a68a4f31 Mon Sep 17 00:00:00 2001
From: Dean Krueger <dkrueger13@gmail.com>
Date: Thu, 16 Jan 2025 11:33:12 -0600
Subject: [PATCH] resolve merge between github icons and dropdown divider

---
 _data/navbar.yml        | 19 +++++++++++++++++--
 _includes/site_nav.html |  8 ++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/_data/navbar.yml b/_data/navbar.yml
index 24d85889..9b159a96 100644
--- a/_data/navbar.yml
+++ b/_data/navbar.yml
@@ -60,6 +60,8 @@
 - title: "Software"
   url: "/software"
   subcategories:
+    - subheading: "CNERG-Managed"
+      target: "_blank"
     - subtitle: "Svalinn"
       exturl: "https://svalinn.github.io"
       target: "_blank"
@@ -80,9 +82,22 @@
       exturl: "https://fuelcycle.org"
       target: "_blank"
       github: "https://github.com/cyclus/cyclus"
-    - subtitle: "FRENSIE"
-      exturl: "https://github.com/FRENSIE/FRENSIE"
+    - subtitle: divider
+    - subheading: "Affiliates"
+      target: "_blank"
+    - subtitle: Cardinal
+      exturl: "https://cardinal.cels.anl.gov/"
       target: "_blank"
+      github: "https://github.com/neams-th-coe/cardinal"
+    - subtitle: OpenMC
+      exturl: "https://docs.openmc.org"
+      target: "_blank"
+      github: "https://github.com/openmc-dev/openmc"
+    - subtitle: MontePy
+      exturl: "https://www.montepy.org/en/stable/"
+      target: "_blank"
+      github: "https://github.com/idaholab/MontePy"
+
 
 - title: "Upload to CNERG"
   url: "upload.html"
diff --git a/_includes/site_nav.html b/_includes/site_nav.html
index 753c776c..8119d3ab 100644
--- a/_includes/site_nav.html
+++ b/_includes/site_nav.html
@@ -12,10 +12,13 @@
                 <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="{{ site.baseurl }}/{{ item.url }}" >{{ item.title }}</a>
                 <div class="dropdown-menu" aria-labelledby="download">
             {% for subcategory in item.subcategories %}
-              {% if subcategory.subtitle == "divider" %}
-              <div class="dropdown-divider"></div>
+              {% if subcategory.subheading != null %}
+                  <div class="dropdown-header">{{ subcategory.subheading }}</div>
               {% else %}
               <div class="dropdown-item">
+              {% if subcategory.subtitle == "divider" %}
+                <div class="dropdown-divider"></div>
+              {% else %}
               {% if subcategory.suburl == null %}
                   <a target="{{ subcategory.target }}" href="{{ subcategory.exturl }}">
                     {% if subcategory.icon != null %}
@@ -36,6 +39,7 @@
                   <a href="{{ subcategory.github }}" target="_blank"><img class="cnerg-service-menu-icon" src="{{ site.baseurl }}/services/icons/github.svg"></a>
                   {% endif %}
               {% endif %}
+              {% endif %}
               </div>
               {% endif %}
             {% endfor %}