From 763a31924bc789a27d7b02ff186c7343c3e5066b Mon Sep 17 00:00:00 2001
From: rebeccahongsf <rebeccahongsf@gmail.com>
Date: Fri, 3 May 2024 11:23:14 -0700
Subject: [PATCH 1/7] SUP-190 | @rebeccahongsf | style text area paragraph

---
 src/components/elements/headers.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/elements/headers.tsx b/src/components/elements/headers.tsx
index 2f621a0a..390ee4b5 100644
--- a/src/components/elements/headers.tsx
+++ b/src/components/elements/headers.tsx
@@ -7,7 +7,7 @@ const headingLinkClasses = "[&_a]:hocus:underline";
 
 export const H1 = ({children, className, ...props}: Props) => {
   return (
-    <h1 className={twMerge(className, "text-m4")} {...props}>
+    <h1 className={twMerge(className, "text-m4 font-normal")} {...props}>
       {children}
     </h1>
   )
@@ -15,7 +15,7 @@ export const H1 = ({children, className, ...props}: Props) => {
 
 export const H2 = ({children, className, ...props}: Props) => {
   return (
-    <h2 className={twMerge(headingLinkClasses, "text-m3", className)} {...props}>
+    <h2 className={twMerge(headingLinkClasses, "text-m3 font-normal", className)} {...props}>
       {children}
     </h2>
   )
@@ -23,7 +23,7 @@ export const H2 = ({children, className, ...props}: Props) => {
 
 export const H3 = ({children, className, ...props}: Props) => {
   return (
-    <h3 className={twMerge(headingLinkClasses, "text-m2", className)} {...props}>
+    <h3 className={twMerge(headingLinkClasses, "text-m2 font-normal", className)} {...props}>
       {children}
     </h3>
   )
@@ -31,7 +31,7 @@ export const H3 = ({children, className, ...props}: Props) => {
 
 export const H4 = ({children, className, ...props}: Props) => {
   return (
-    <h4 className={twMerge(headingLinkClasses, "text-m1", className)} {...props}>
+    <h4 className={twMerge(headingLinkClasses, "text-m1 font-normal", className)} {...props}>
       {children}
     </h4>
   )

From 620d9265fcb705bf4f1fb1c804d55b3bb915d445 Mon Sep 17 00:00:00 2001
From: rebeccahongsf <rebeccahongsf@gmail.com>
Date: Mon, 6 May 2024 08:40:56 -0700
Subject: [PATCH 2/7] add link styles

---
 src/components/elements/action-link.tsx                        | 2 +-
 src/components/elements/link.tsx                               | 3 ++-
 .../stanford-media-caption/media-caption-paragraph.tsx         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/elements/action-link.tsx b/src/components/elements/action-link.tsx
index d53f0944..7a997d42 100644
--- a/src/components/elements/action-link.tsx
+++ b/src/components/elements/action-link.tsx
@@ -12,7 +12,7 @@ type Props = HtmlHTMLAttributes<HTMLAnchorElement> & {
 
 const ActionLink = ({ children, className, ...props }: Props) => {
   return (
-    <Link {...props} className={twMerge("relative", className?.replace("link--action", ""))}>
+    <Link {...props} className={twMerge("relative text-digital-red *:text-digital-red hocus:text-archway-dark *:hocus:text-archway-dark", className?.replace("link--action", ""))}>
       {children}
       <ArrowLongRightIcon height={20} className="ml-2 inline-block mb-2"/>
     </Link>
diff --git a/src/components/elements/link.tsx b/src/components/elements/link.tsx
index 91d5857d..65e63a1e 100644
--- a/src/components/elements/link.tsx
+++ b/src/components/elements/link.tsx
@@ -4,6 +4,7 @@ import {EnvelopeIcon} from "@heroicons/react/24/outline";
 import ActionLink from "@components/elements/action-link";
 import Button from "@components/elements/button";
 import {LinkProps} from "next/dist/client/link";
+import clsx from "clsx";
 
 type Props = HtmlHTMLAttributes<HTMLAnchorElement | HTMLButtonElement> & LinkProps & {
   /**
@@ -43,7 +44,7 @@ const DrupalLink = ({href, children, ...props}: Props) => {
   }
 
   return (
-    <Link href={href} {...props}>
+    <Link href={href} className={clsx("text-digital-red *:text-digital-red hocus:text-archway-dark *:hocus:text-archway-dark", props.className)} {...props}>
       {children}
       {href.startsWith("mailto") &&
         <EnvelopeIcon width={20} className="ml-4 inline-block"/>
diff --git a/src/components/paragraphs/stanford-media-caption/media-caption-paragraph.tsx b/src/components/paragraphs/stanford-media-caption/media-caption-paragraph.tsx
index 8819330f..bf256f2a 100644
--- a/src/components/paragraphs/stanford-media-caption/media-caption-paragraph.tsx
+++ b/src/components/paragraphs/stanford-media-caption/media-caption-paragraph.tsx
@@ -34,7 +34,7 @@ const MediaCaptionParagraph = ({paragraph, ...props}: Props) => {
 
       <figcaption>
         {paragraph.suMediaCaptionLink?.url &&
-          <Link href={paragraph.suMediaCaptionLink.url} className="link--action text-stone-dark hocus:text-archway-dark">
+          <Link href={paragraph.suMediaCaptionLink.url} className="link--action text-stone-dark *:text-stone-dark hocus:text-archway-dark *:hocus:text-archway-dark">
             {paragraph.suMediaCaptionLink.title}
           </Link>
         }

From 594e1b0ca8704c9d6415f4b38d40f081a938f01c Mon Sep 17 00:00:00 2001
From: rebeccahongsf <rebeccahongsf@gmail.com>
Date: Thu, 9 May 2024 19:34:11 -0700
Subject: [PATCH 3/7] fixup merge conflict

---
 src/components/elements/link.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/elements/link.tsx b/src/components/elements/link.tsx
index 0d693a60..65e63a1e 100644
--- a/src/components/elements/link.tsx
+++ b/src/components/elements/link.tsx
@@ -4,11 +4,7 @@ import {EnvelopeIcon} from "@heroicons/react/24/outline";
 import ActionLink from "@components/elements/action-link";
 import Button from "@components/elements/button";
 import {LinkProps} from "next/dist/client/link";
-<<<<<<< HEAD
 import clsx from "clsx";
-=======
-import {twMerge} from "tailwind-merge";
->>>>>>> 1.x
 
 type Props = HtmlHTMLAttributes<HTMLAnchorElement | HTMLButtonElement> & LinkProps & {
   /**

From e5e5310ae140a2e58738bd0264e9bdb9996554f7 Mon Sep 17 00:00:00 2001
From: rebeccahongsf <rebeccahongsf@gmail.com>
Date: Fri, 10 May 2024 10:19:27 -0700
Subject: [PATCH 4/7] fixup h5 and h6 headings

---
 src/components/elements/headers.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/elements/headers.tsx b/src/components/elements/headers.tsx
index 390ee4b5..2d06f267 100644
--- a/src/components/elements/headers.tsx
+++ b/src/components/elements/headers.tsx
@@ -39,7 +39,7 @@ export const H4 = ({children, className, ...props}: Props) => {
 
 export const H5 = ({children, className, ...props}: Props) => {
   return (
-    <h5 className={twMerge(headingLinkClasses, className)} {...props}>
+    <h5 className={twMerge(headingLinkClasses, "text-m1 font-normal", className)} {...props}>
       {children}
     </h5>
   )
@@ -47,7 +47,7 @@ export const H5 = ({children, className, ...props}: Props) => {
 
 export const H6 = ({children, className, ...props}: Props) => {
   return (
-    <h6 className={twMerge(headingLinkClasses, className)} {...props}>
+    <h6 className={twMerge(headingLinkClasses, "text-m1 font-normal", className)} {...props}>
       {children}
     </h6>
   )

From a7bf9ff5258ae61fb137c40c60f9acf9c49f80c5 Mon Sep 17 00:00:00 2001
From: rebeccahongsf <rebeccahongsf@gmail.com>
Date: Fri, 10 May 2024 10:21:41 -0700
Subject: [PATCH 5/7] fixup specificity for footer links

---
 src/components/config-pages/local-footer.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/config-pages/local-footer.tsx b/src/components/config-pages/local-footer.tsx
index 286b01ad..ab4c3f5b 100644
--- a/src/components/config-pages/local-footer.tsx
+++ b/src/components/config-pages/local-footer.tsx
@@ -32,12 +32,12 @@ const LocalFooter = ({
 
         {/* Social Links */}
         {suLocalFootSocial &&
-          <ul className="list-unstyled flex rs-mb-0 [&_a]:text-white [&_a:hover]:text-bay-light">
+          <ul className="list-unstyled flex rs-mb-0">
             {suLocalFootSocial.map((link, index) => {
               if (!link.url) return;
               return (
                 <li key={`footer-action-link-${index}`} className="rs-mr-0">
-                  <Link href={link.url}>
+                  <Link href={link.url} className="text-white hocus:text-bay-light">
                     <SocialIcon url={link.url}/>
                     <span className="sr-only">{link.title}</span>
                   </Link>

From 612bb6d07101e586242dfb75cd0e331f14fcdd73 Mon Sep 17 00:00:00 2001
From: rebeccahongsf <rebeccahongsf@gmail.com>
Date: Fri, 10 May 2024 10:30:59 -0700
Subject: [PATCH 6/7] add wysiwyg link color

---
 src/components/elements/wysiwyg.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/elements/wysiwyg.tsx b/src/components/elements/wysiwyg.tsx
index 272d518a..22a943e7 100644
--- a/src/components/elements/wysiwyg.tsx
+++ b/src/components/elements/wysiwyg.tsx
@@ -22,7 +22,7 @@ const Wysiwyg = ({html, className, ...props}: Props) => {
 
   const addMathJax = html.match(/\$\$.*\$\$/) || html.match(/\\\[.*\\\]/) || html.match(/\\\(.*\\\)/);
   return (
-    <div className={twMerge("wysiwyg", className)} {...props}>
+    <div className={twMerge("wysiwyg [&_a]:text-digital-red hocus:[&_a]:text-archway-dark", className)} {...props}>
       {addMathJax && <Mathjax/>}
       {formatHtml(html)}
     </div>

From b7d069fe5912e96611806198cade80b64b1020fd Mon Sep 17 00:00:00 2001
From: rebeccahongsf <rebeccahongsf@gmail.com>
Date: Wed, 22 May 2024 10:50:31 -0700
Subject: [PATCH 7/7] revert back to font medium

---
 src/components/elements/headers.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/elements/headers.tsx b/src/components/elements/headers.tsx
index 2d06f267..7803a552 100644
--- a/src/components/elements/headers.tsx
+++ b/src/components/elements/headers.tsx
@@ -7,7 +7,7 @@ const headingLinkClasses = "[&_a]:hocus:underline";
 
 export const H1 = ({children, className, ...props}: Props) => {
   return (
-    <h1 className={twMerge(className, "text-m4 font-normal")} {...props}>
+    <h1 className={twMerge(className, "text-m4 font-medium")} {...props}>
       {children}
     </h1>
   )
@@ -15,7 +15,7 @@ export const H1 = ({children, className, ...props}: Props) => {
 
 export const H2 = ({children, className, ...props}: Props) => {
   return (
-    <h2 className={twMerge(headingLinkClasses, "text-m3 font-normal", className)} {...props}>
+    <h2 className={twMerge(headingLinkClasses, "text-m3 font-medium", className)} {...props}>
       {children}
     </h2>
   )
@@ -23,7 +23,7 @@ export const H2 = ({children, className, ...props}: Props) => {
 
 export const H3 = ({children, className, ...props}: Props) => {
   return (
-    <h3 className={twMerge(headingLinkClasses, "text-m2 font-normal", className)} {...props}>
+    <h3 className={twMerge(headingLinkClasses, "text-m2 font-medium", className)} {...props}>
       {children}
     </h3>
   )
@@ -31,7 +31,7 @@ export const H3 = ({children, className, ...props}: Props) => {
 
 export const H4 = ({children, className, ...props}: Props) => {
   return (
-    <h4 className={twMerge(headingLinkClasses, "text-m1 font-normal", className)} {...props}>
+    <h4 className={twMerge(headingLinkClasses, "text-m1 font-medium", className)} {...props}>
       {children}
     </h4>
   )
@@ -39,7 +39,7 @@ export const H4 = ({children, className, ...props}: Props) => {
 
 export const H5 = ({children, className, ...props}: Props) => {
   return (
-    <h5 className={twMerge(headingLinkClasses, "text-m1 font-normal", className)} {...props}>
+    <h5 className={twMerge(headingLinkClasses, "text-m1 font-medium", className)} {...props}>
       {children}
     </h5>
   )
@@ -47,7 +47,7 @@ export const H5 = ({children, className, ...props}: Props) => {
 
 export const H6 = ({children, className, ...props}: Props) => {
   return (
-    <h6 className={twMerge(headingLinkClasses, "text-m1 font-normal", className)} {...props}>
+    <h6 className={twMerge(headingLinkClasses, "text-m1 font-medium", className)} {...props}>
       {children}
     </h6>
   )