Merge branch 'main' into faris/fun-fixes

acmucsd · Mar 30, 2024 · 08fd09c · 08fd09c
2 parents 1aa7009 + 4020a81
commit 08fd09c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -18,6 +18,7 @@ export default function MyApp({ Component, pageProps }: AppProps) {
     <>
       <style jsx global>{`
         * {
+          transition: all ease;
           font-family: ${dmSans.style.fontFamily}, sans-serif;
         }
       `}</style>

diff --git a/src/styles/globals.scss b/src/styles/globals.scss
@@ -7,6 +7,7 @@ body {
   margin: 0;
   padding: 0;
   scroll-padding-top: 4.25rem;
+  transition: background-color 0.3s ease;
 }
 
 /* This prevents the background from scrolling while a modal is open. */
@@ -67,12 +68,14 @@ label {
   font-size: 100%;
   margin: 0;
   padding: 0;
-  transition: background 0.3s ease;
+  transition: background-color 0.3s ease;
   vertical-align: baseline;
 }
 
 div,
+input,
 span,
+form,
 object,
 iframe,
 img,
@@ -96,12 +99,13 @@ header,
 section,
 summary,
 mark,
+main,
 audio,
 video {
   border: 0;
   margin: 0;
   padding: 0;
-  transition: background 0.3s ease;
+  transition: background-color 0.3s ease;
 }
 
 a,

diff --git a/src/styles/themes.scss b/src/styles/themes.scss
@@ -108,7 +108,4 @@
 html,
 body {
   background-color: var(--theme-background);
-  transition-duration: 0.3s;
-  transition-property: background-color, color, border-color, border, filter;
-  transition-timing-function: ease;
 }