fix merge conflicts with About page

app/static/css/partials/_layout.scss

@@ -4,6 +4,8 @@
 	--bg-color-3: #ffff00;
 	--bg-color-4: #ff3399;
 
+    --color-link: #ee0;
+
     --spacing: 8px;
     --spacing-2: calc(var(--spacing) * 2);
 
@@ -14,14 +16,23 @@
 @keyframes background_animation {
     0%,100% {
         background-position: 0 0;
-        color: #ddd;
     }
 
     50% {
         background-position: 100% 0;
+    }
+}
+
+@keyframes text_animation {
+    0%,100% {
+        color: #ddd;
+    }
+
+    50% {
         color: #000;
     }
 }
+
 body.animated {
     background: linear-gradient(to right, var(--bg-color-1), var(--bg-color-2) , var(--bg-color-3), var(--bg-color-4));
     //animation: background_animation 60s ease-in-out infinite;
@@ -29,6 +40,10 @@ body.animated {
     color: #ddd;
 }
 
+body.animated-text {
+    animation: text_animation 60s ease-in-out infinite;
+}
+
 body {
     color: #ddd;
     font-family: "noto_sans", sans-serif;
@@ -63,3 +78,14 @@ nav {
     padding-left: var(--spacing-2);
     padding-right: var(--spacing-2);
 }
+
+// Animations: Fade In
+@keyframes fade_in {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}