fix merge conflict

digitoimistodude · Oct 25, 2024 · 6a9e8bd · 6a9e8bd
2 parents b79facd + ee9fb98
commit 6a9e8bd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/css/dev/global.css b/css/dev/global.css
diff --git a/css/prod/global.css b/css/prod/global.css
diff --git a/sass/views/_404.scss b/sass/views/_404.scss
@@ -12,7 +12,8 @@
   }
 
   h1 {
-    font-size: clamp-calc($container-mobile, 1600px, 42px, 200px);
+    font-size: clamp-calc($container-mobile, 1600px, 60px, 120px);
+    line-height: var(--line-height-core-heading);
     margin-bottom: 2rem;
   }
 }