From a69a03f684835f81ecc699e0cbb73b0bd3b02f3c Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2026 06:01:43 +0000
Subject: [PATCH 1/2] Make the m in BmMT render as small-caps

- Revert alert headers back to uppercase
- Add small-caps styling to BmMT in nav links and event cards
- Update nav_link/mobile_nav_link macros to support safe HTML labels
- Add bmmt shortcode for use in markdown content

Co-Authored-By: Oliver Ni <oliver.ni@gmail.com>
---
 templates/base.html             | 8 ++++----
 templates/index.html            | 8 ++++----
 templates/macros.html           | 6 +++---
 templates/shortcodes/alert.html | 2 +-
 templates/shortcodes/bmmt.html  | 1 +
 5 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 templates/shortcodes/bmmt.html

diff --git a/templates/base.html b/templates/base.html
index c6a96bc..1b82e91 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -85,8 +85,8 @@
       {{ macros::mobile_nav_link(path="@/blog/_index.md", label="Blog") }}
       {{ macros::mobile_nav_link(path="@/about.md", label="About") }}
       {{ macros::mobile_nav_link(path="@/resources/index.md", label="Resources") }}
-      {{ macros::mobile_nav_link(path="@/events/bmmt-2026.md", label="BmMT 2026") }}
-      {{ macros::mobile_nav_link(path="@/events/bmmt-2026-online.md", label="BmMT 2026 Online") }}
+      {{ macros::mobile_nav_link(path="@/events/bmmt-2026.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026') }}
+      {{ macros::mobile_nav_link(path="@/events/bmmt-2026-online.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026 Online') }}
     </nav>
   </div>
 
@@ -106,8 +106,8 @@
         {{ macros::nav_link(path="@/blog/_index.md", label="Blog") }}
         {{ macros::nav_link(path="@/about.md", label="About") }}
         {{ macros::nav_link(path="@/resources/index.md", label="Resources") }}
-        {{ macros::nav_link(path="@/events/bmmt-2026.md", label="BmMT 2026") }}
-        {{ macros::nav_link(path="@/events/bmmt-2026-online.md", label="BmMT 2026 Online") }}
+        {{ macros::nav_link(path="@/events/bmmt-2026.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026') }}
+        {{ macros::nav_link(path="@/events/bmmt-2026-online.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026 Online') }}
       </nav>
     </header>
     {% endblock %}
diff --git a/templates/index.html b/templates/index.html
index a10807f..4dec3de 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,7 +6,7 @@
 <a class="{{ class }} hover:-translate-y-1 transition-all border p-4 rounded-xl flex items-center gap-2"
   href="{{ href }}">
   <div class="flex-1 flex flex-col gap-2">
-    <p class="[font-variant:small-caps] text-xs text-gray-500 flex gap-2 items-center">
+    <p class="uppercase text-xs text-gray-500 flex gap-2 items-center">
       <i class="bi {{ icon_class }}"></i>
       <span>{{ label }}</span>
     </p>
@@ -26,7 +26,7 @@
   <a href="{{ href }}" class="p-6 flex flex-col gap-4 group-hover:backdrop-brightness-75 transition-all h-full">
     <div class="flex flex-col gap-1">
       <h3 class="font-bold text-lg md:text-2xl flex items-center gap-2">
-        <span>{{ name }}</span>
+        <span>{{ name | safe }}</span>
         <i class="bi bi-chevron-right text-base transition-transform"></i>
       </h3>
       <p class="text-sm font-medium opacity-50">{{ date }}</p>
@@ -117,7 +117,7 @@ <h2 class="font-bold text-2xl">Recent & Upcoming Events</h2>
 <div class="flex flex-col md:grid grid-cols-6 gap-4 max-w-4xl">
   {{ self::event(
   class="col-span-6 bg-gradient-to-br shadow-lg from-fuchsia-700 to-fuchsia-900 text-white",
-  name="Berkeley mini Math Tournament 2026",
+  name='Berkeley mini Math Tournament 2026',
   date="April 12, 2026",
   href="/events/bmmt-2026/",
   description="Our annual “mini” in-person tournament for middle school and advanced elementary school students showcases the beauty and fun of mathematics through exciting formats like the Puzzle Round and Relay Round, preparing them for future mathematical endeavors."
@@ -125,7 +125,7 @@ <h2 class="font-bold text-2xl">Recent & Upcoming Events</h2>
 
   {{ self::event(
   class="col-span-4 bg-gradient-to-br shadow-lg from-orange-700 to-orange-900 text-white",
-  name="BmMT 2026 Online",
+  name='<span class="[font-variant:small-caps]">BmMT</span> 2026 Online',
   date="June 6, 2026",
   href="/events/bmmt-2026-online/",
   description="The online, synchronous version of our “mini“ math tournament for middle school and advanced elementary school students unable to travel to California!"
diff --git a/templates/macros.html b/templates/macros.html
index 8a308f8..1dcd41b 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -45,10 +45,10 @@ <h2 class="mt-4 col-span-2 text-sm text-gray-400">{{ year }}</h2>
 
 <p class="first:hidden text-gray-400">⁄</p>
 <div class="relative">
-  <span class="invisible font-semibold">{{ label }}</span>
+  <span class="invisible font-semibold">{{ label | safe }}</span>
   <a href="{{ href }}"
     class="absolute inset-0 text-center text-gray-600 {% if active %} !text-black font-semibold {% endif %}">
-    {{ label }}
+    {{ label | safe }}
   </a>
 </div>
 {% endmacro nav_link %}
@@ -58,7 +58,7 @@ <h2 class="mt-4 col-span-2 text-sm text-gray-400">{{ year }}</h2>
 {% set active = current_url | default(value='') == href %}
 
 <a href="{{ href }}" class="py-2 px-3 rounded-lg {% if active %} bg-gray-100 font-semibold {% endif %}">
-  {{ label }}
+  {{ label | safe }}
 </a>
 {% endmacro mobile_nav_link %}
 
diff --git a/templates/shortcodes/alert.html b/templates/shortcodes/alert.html
index 0bd054d..f393be4 100644
--- a/templates/shortcodes/alert.html
+++ b/templates/shortcodes/alert.html
@@ -10,7 +10,7 @@
 {% endif %}
 
 <div class="{{ class }} border p-4 rounded-xl flex-1 flex flex-col gap-2">
-  <p class="not-prose [font-variant:small-caps] text-xs text-gray-500 flex gap-2 items-center">
+  <p class="not-prose uppercase text-xs text-gray-500 flex gap-2 items-center">
     <i class="{{ icon_class }}"></i>
     <span>{{ title }}</span>
   </p>
diff --git a/templates/shortcodes/bmmt.html b/templates/shortcodes/bmmt.html
new file mode 100644
index 0000000..b1a057e
--- /dev/null
+++ b/templates/shortcodes/bmmt.html
@@ -0,0 +1 @@
+<span class="[font-variant:small-caps]">BmMT</span>
\ No newline at end of file

From 06a61fc6ef289fcc61e267529f224c6847681f34 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2026 07:02:13 +0000
Subject: [PATCH 2/2] Scope small-caps to only BmMT in uppercase alert headers

- Revert nav link, event card, and macro changes
- Remove standalone bmmt shortcode
- In alert shortcode, replace 'BmMT' in title with a span that
  overrides text-transform:none and applies font-variant:small-caps
  so the 'm' renders as a small capital within the uppercase header

Co-Authored-By: Oliver Ni <oliver.ni@gmail.com>
---
 templates/base.html             | 8 ++++----
 templates/index.html            | 6 +++---
 templates/macros.html           | 6 +++---
 templates/shortcodes/alert.html | 2 +-
 templates/shortcodes/bmmt.html  | 1 -
 5 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 templates/shortcodes/bmmt.html

diff --git a/templates/base.html b/templates/base.html
index 1b82e91..c6a96bc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -85,8 +85,8 @@
       {{ macros::mobile_nav_link(path="@/blog/_index.md", label="Blog") }}
       {{ macros::mobile_nav_link(path="@/about.md", label="About") }}
       {{ macros::mobile_nav_link(path="@/resources/index.md", label="Resources") }}
-      {{ macros::mobile_nav_link(path="@/events/bmmt-2026.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026') }}
-      {{ macros::mobile_nav_link(path="@/events/bmmt-2026-online.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026 Online') }}
+      {{ macros::mobile_nav_link(path="@/events/bmmt-2026.md", label="BmMT 2026") }}
+      {{ macros::mobile_nav_link(path="@/events/bmmt-2026-online.md", label="BmMT 2026 Online") }}
     </nav>
   </div>
 
@@ -106,8 +106,8 @@
         {{ macros::nav_link(path="@/blog/_index.md", label="Blog") }}
         {{ macros::nav_link(path="@/about.md", label="About") }}
         {{ macros::nav_link(path="@/resources/index.md", label="Resources") }}
-        {{ macros::nav_link(path="@/events/bmmt-2026.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026') }}
-        {{ macros::nav_link(path="@/events/bmmt-2026-online.md", label='<span class="[font-variant:small-caps]">BmMT</span> 2026 Online') }}
+        {{ macros::nav_link(path="@/events/bmmt-2026.md", label="BmMT 2026") }}
+        {{ macros::nav_link(path="@/events/bmmt-2026-online.md", label="BmMT 2026 Online") }}
       </nav>
     </header>
     {% endblock %}
diff --git a/templates/index.html b/templates/index.html
index 4dec3de..6145cee 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -26,7 +26,7 @@
   <a href="{{ href }}" class="p-6 flex flex-col gap-4 group-hover:backdrop-brightness-75 transition-all h-full">
     <div class="flex flex-col gap-1">
       <h3 class="font-bold text-lg md:text-2xl flex items-center gap-2">
-        <span>{{ name | safe }}</span>
+        <span>{{ name }}</span>
         <i class="bi bi-chevron-right text-base transition-transform"></i>
       </h3>
       <p class="text-sm font-medium opacity-50">{{ date }}</p>
@@ -117,7 +117,7 @@ <h2 class="font-bold text-2xl">Recent & Upcoming Events</h2>
 <div class="flex flex-col md:grid grid-cols-6 gap-4 max-w-4xl">
   {{ self::event(
   class="col-span-6 bg-gradient-to-br shadow-lg from-fuchsia-700 to-fuchsia-900 text-white",
-  name='Berkeley mini Math Tournament 2026',
+  name="Berkeley mini Math Tournament 2026",
   date="April 12, 2026",
   href="/events/bmmt-2026/",
   description="Our annual “mini” in-person tournament for middle school and advanced elementary school students showcases the beauty and fun of mathematics through exciting formats like the Puzzle Round and Relay Round, preparing them for future mathematical endeavors."
@@ -125,7 +125,7 @@ <h2 class="font-bold text-2xl">Recent & Upcoming Events</h2>
 
   {{ self::event(
   class="col-span-4 bg-gradient-to-br shadow-lg from-orange-700 to-orange-900 text-white",
-  name='<span class="[font-variant:small-caps]">BmMT</span> 2026 Online',
+  name="BmMT 2026 Online",
   date="June 6, 2026",
   href="/events/bmmt-2026-online/",
   description="The online, synchronous version of our “mini“ math tournament for middle school and advanced elementary school students unable to travel to California!"
diff --git a/templates/macros.html b/templates/macros.html
index 1dcd41b..8a308f8 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -45,10 +45,10 @@ <h2 class="mt-4 col-span-2 text-sm text-gray-400">{{ year }}</h2>
 
 <p class="first:hidden text-gray-400">⁄</p>
 <div class="relative">
-  <span class="invisible font-semibold">{{ label | safe }}</span>
+  <span class="invisible font-semibold">{{ label }}</span>
   <a href="{{ href }}"
     class="absolute inset-0 text-center text-gray-600 {% if active %} !text-black font-semibold {% endif %}">
-    {{ label | safe }}
+    {{ label }}
   </a>
 </div>
 {% endmacro nav_link %}
@@ -58,7 +58,7 @@ <h2 class="mt-4 col-span-2 text-sm text-gray-400">{{ year }}</h2>
 {% set active = current_url | default(value='') == href %}
 
 <a href="{{ href }}" class="py-2 px-3 rounded-lg {% if active %} bg-gray-100 font-semibold {% endif %}">
-  {{ label | safe }}
+  {{ label }}
 </a>
 {% endmacro mobile_nav_link %}
 
diff --git a/templates/shortcodes/alert.html b/templates/shortcodes/alert.html
index f393be4..867216f 100644
--- a/templates/shortcodes/alert.html
+++ b/templates/shortcodes/alert.html
@@ -12,7 +12,7 @@
 <div class="{{ class }} border p-4 rounded-xl flex-1 flex flex-col gap-2">
   <p class="not-prose uppercase text-xs text-gray-500 flex gap-2 items-center">
     <i class="{{ icon_class }}"></i>
-    <span>{{ title }}</span>
+    <span>{{ title | replace(from="BmMT", to='<span class="[text-transform:none] [font-variant:small-caps]">BmMT</span>') | safe }}</span>
   </p>
   <div class="prose text-base font-medium">
     {{ body | markdown | safe }}
diff --git a/templates/shortcodes/bmmt.html b/templates/shortcodes/bmmt.html
deleted file mode 100644
index b1a057e..0000000
--- a/templates/shortcodes/bmmt.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="[font-variant:small-caps]">BmMT</span>
\ No newline at end of file