From b6d57179f851bc0622daa55bcbe751f724dba4cd Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 13 Sep 2023 15:58:00 -0500
Subject: [PATCH] feat: texascale, cms v3.12.0 beta (#713)

---
 taccsite_cms/settings.py                                        | 1 +
 taccsite_cms/static/site_cms/css/src/_imports/settings/font.css | 2 +-
 taccsite_custom                                                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py
index febe1efee..fc4eac53a 100644
--- a/taccsite_cms/settings.py
+++ b/taccsite_cms/settings.py
@@ -469,6 +469,7 @@ def get_subdirs_as_module_names(path):
     for entry in os.scandir(path):
         is_app = (
             entry.path.find('_readme') == -1 and # explains common project dirs
+            entry.path.find('-org') == -1 and    # deprecated Texascale templates
             entry.path.find('-cms') == -1 and    # deprecated project templates
             entry.path.find('docs') == -1        # documentation beyond README
         )
diff --git a/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css b/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css
index 770e8e4e5..a1da44cd7 100644
--- a/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css
+++ b/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css
@@ -1,6 +1,6 @@
 :root {
   /* FAQ: Used by TACC/Core-Styles `s-header` */
-  /* FAQ: Overwritten by TACC/Core-CMS-Resource:/texascale_org `props.font` */
+  /* FAQ: Overwritten by TACC/Core-CMS-Resource:/texascale_cms `props.font` */
   --global-font-family: var(--global-font-family--sans);
 
   /* To overwrite Boostrap */
diff --git a/taccsite_custom b/taccsite_custom
index 964e34648..6153961d0 160000
--- a/taccsite_custom
+++ b/taccsite_custom
@@ -1 +1 @@
-Subproject commit 964e346480c094b39401648a345c47575e8f3988
+Subproject commit 6153961d0fd2c77fc73980a2bb1308512cdc1ac5