Merge branch 'main' into sean/public-event

acmucsd · Apr 23, 2024 · 488a5c6 · 488a5c6
2 parents 8853da4 + 3d2190b
commit 488a5c6
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/src/components/common/ThemeToggle/index.tsx b/src/components/common/ThemeToggle/index.tsx
@@ -29,7 +29,7 @@ const ThemeToggle = () => {
     // This affects the color of the safe zone on iPhone 15.
     const metaThemeColor = document.querySelector('meta[name="theme-color"]');
     if (metaThemeColor && resolvedTheme === 'dark') {
-      metaThemeColor.setAttribute('content', '#37393e');
+      metaThemeColor.setAttribute('content', '#25262b');
     } else if (metaThemeColor) {
       metaThemeColor.setAttribute('content', '#fff');
     }

diff --git a/src/components/events/EventBadges/index.tsx b/src/components/events/EventBadges/index.tsx
@@ -24,7 +24,9 @@ const EventBadges = ({ event, attended, className }: EventBadgesProps) => {
   return (
     <div className={`${styles.badges} ${className || ''}`}>
       {!isOrderPickupEvent(event) && ongoing ? (
-        <div className={`${styles.badge} ${styles.badgeLive}`}>• Live</div>
+        <div className={`${styles.badge} ${styles.badgeLive}`}>
+          <span>•</span> Live
+        </div>
       ) : null}
       {committee ? (
         <div className={`${styles.badge} ${styles[`badge${community}`]}`}>

diff --git a/src/components/events/EventBadges/style.module.scss b/src/components/events/EventBadges/style.module.scss
@@ -17,6 +17,38 @@
       background-color: vars.$danger-1;
       border-color: vars.$danger-1;
       color: #fff;
+      position: relative;
+
+      > span {
+        animation: pulse 1s ease-in-out infinite alternate;
+
+        @keyframes pulse {
+          0% { opacity: 0 }
+          100% {opacity: 1 }
+        }
+      }
+
+      &::before {
+        animation: pulse2 2s ease-out forwards infinite;
+        border: 2px solid vars.$danger-1;
+        border-radius: 5px;
+        content: '';
+        position: absolute;
+
+        @keyframes pulse2 {
+          0% {
+            filter: blur(0);
+            inset: 0;
+            opacity: 1;
+          }
+
+          100% {
+            filter: blur(2px);
+            inset: -0.75rem;
+            opacity: 0;
+          }
+        }
+      }
     }
 
     &.badgeGeneral {

diff --git a/src/components/events/EventBadges/style.module.scss.d.ts b/src/components/events/EventBadges/style.module.scss.d.ts
@@ -9,6 +9,8 @@ export type Styles = {
   badgeLive: string;
   badgePoints: string;
   badges: string;
+  pulse: string;
+  pulse2: string;
 };
 
 export type ClassNames = keyof Styles;