Merge pull request #69 from 7th-heaven-co/HEAVB-17, HEAVB-18, HEAVB-19, HEAVB-23

jazicorn · web-flow · commit 0480ae9ca219 · 2025-05-03T08:44:20.000-04:00
feat: HEAVB-17, HEAVB-18, HEAVB-19, HEAVB-23
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "version": "1.3.0",
   "scripts": {
     "sass": "sass src/styles/global.scss public/styles/global.css --no-source-map",
-    "dev-sass": "npx sass --watch src/styles/global.scss:public/styles/global.css",
+    "dev:sass": "npx sass --watch src/styles/global.scss:public/styles/global.css",
     "dev": "astro dev --remote",
     "build": "npm run sass && astro build --remote",
     "preview": "wrangler pages dev ./dist",
@@ -21,7 +21,8 @@
     "semantic-release": "semantic-release --extends ./release.config.cjs",
     "commit": "git commit --no-edit",
     "verify-map": "node scripts/verify-components-map.js",
-    "fetch:all": "git fetch --all --prune"
+    "fetch:all": "git fetch --all --prune",
+    "merge:dev": "git merge dev"
   },
   "dependencies": {
     "@astrojs/cloudflare": "^12.2.4",
diff --git a/src/pages/404.astro b/src/pages/404.astro
@@ -0,0 +1,41 @@
+---
+import '../styles/global.scss';
+import { PROFILE, SITE_DESCRIPTION, SITE_TITLE } from 'astro:env/client';
+import BaseHead from '../components/BaseHead.astro';
+import Footer from '../components/Footer.astro';
+import Header from '../components/Header.astro';
+import PgBgHome from '../components/PgBgHome.astro';
+import PgLoader from '../components/PgLoader.astro';
+import PgLoaderRadical from '../components/PgLoaderRadical.astro';
+---
+
+<!doctype html>
+<html lang="en">
+  <head>
+    <BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
+    <script is:inline type="module">
+      import { init } from "/scripts/fade/index.js";
+      init();
+    </script>
+  </head>
+  <body id="error-404">
+    <!-- Loader overlay -->
+    <PgLoader />
+
+    <!-- Bg -->
+    <PgBgHome />
+    <PgLoaderRadical />
+
+    <!-- Home Page -->
+    <div class="content">
+      <Header />
+      <div class="error-404-info">
+        <div class="container aurora-text">
+          <h2 class="">404</h2>
+          <h3>Page: <span class="">Not Found</span></h3>
+        </div>
+      </div>
+      <Footer />
+    </div>
+  </body>
+</html>
diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss
@@ -24,6 +24,11 @@ $preload-base: #e5e9f0ff;
 $preload-lines: #d3cbe71a;
 
 /* Font Sizes */
+$title-l: 172px;
+$title-m: 148px;
+$title-sm: 120px;
+$title-s: 96px;
+$title-xs: 84px;
 $heading-xxl: 72px;
 $heading-xl: 64px;
 $heading-l: 56px;
diff --git a/src/styles/blog/blog-post.scss b/src/styles/blog/blog-post.scss
@@ -20,7 +20,7 @@
   width: 100%;
   max-width: 1120px;
   height: fit-content;
-  text-align: justify;
+  text-align: left;
   @media (max-width: $media-xs) {
     margin-top: 0em;
   }
@@ -92,6 +92,7 @@
     padding-right: 1em;
 
     font-size: $font-ml;
+    text-align: left;
 
     hr {
       margin-bottom: 2em;
diff --git a/src/styles/general/errors.scss b/src/styles/general/errors.scss
@@ -0,0 +1,60 @@
+@use '../_variables' as *;
+
+#error-404 {
+    margin: 0px;
+    padding: 0px;
+}
+
+#error-404 > .content >  .error-404-info {
+
+    height: 80vh;
+    width: 100%;        
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    
+    .container {
+        height: fit-content;
+        width: fit-content;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding: 50px;
+        
+        h2 {
+            font-size: $title-l;
+        }
+    
+        h3 {
+            font-style: italic;
+            text-decoration-line: underline !important;
+            text-decoration-color: $color-4 !important;
+            text-decoration-thickness: 1px;
+            text-decoration-style: double;
+        }
+
+        @media (max-width: $media-sm) {
+            
+            h2 {
+                font-size: $title-m;
+            }
+            p {
+                height: 150px;
+                width: 150px; 
+            }
+        }
+
+        @media (max-width: $media-xs) {
+            
+            h2 {
+                font-size: $title-s;
+            }
+            p {
+                height: 100px;
+                width: 100px; 
+            }
+        }
+    }
+}
diff --git a/src/styles/general/footer/_footer-links.scss b/src/styles/general/footer/_footer-links.scss
@@ -17,6 +17,7 @@ footer {
 
   #navigation {
     font-size: $font-l;
+   
   }
 
   #contact-email {
diff --git a/src/styles/general/footer/_footer-policy.scss b/src/styles/general/footer/_footer-policy.scss
@@ -6,14 +6,16 @@ footer {
     font-size: $font-sm !important;
 
     ul {
-      margin: 0;
+      margin: 0px 2px;
       padding: 0;
       height: 100%;
       display: flex;
       flex-direction: row;
       justify-content: center;
       align-items: center;
       gap: 1em;
+      flex-wrap: wrap;
+      
 
       a {
         color: $color-2;
@@ -25,6 +27,7 @@ footer {
 
       li {
         text-align: center;
+        white-space: nowrap;
       }
     }
   }
diff --git a/src/styles/general/footer/_footer.scss b/src/styles/general/footer/_footer.scss
@@ -71,8 +71,8 @@ footer {
     }
 
     section:nth-child(1),section:nth-child(2),section:nth-child(3) {
-        min-height: 14em;
-        padding: 1em 4em;
+        min-height: 300px;
+        padding: 28px 36px;
         text-align: left;
     }
 
diff --git a/src/styles/general/icons/icons.scss b/src/styles/general/icons/icons.scss
@@ -202,8 +202,8 @@
 */
 .pixelarticons--mood-sad {
   display: inline-block;
-  width: 24px;
-  height: 24px;
+  width: 100%;
+  height: 100%;
   --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath fill='%23000' d='M5 3h14v2H5zm0 16H3V5h2zm14 0v2H5v-2zm0 0h2V5h-2zM10 8H8v2h2zm4 0h2v2h-2zm-5 8v-2h6v2h2v-2h-2v-2H9v2H7v2z'/%3E%3C/svg%3E");
   background-color: currentColor;
   -webkit-mask-image: var(--svg);
diff --git a/src/styles/global.scss b/src/styles/global.scss
@@ -7,6 +7,7 @@
 @use './general/bg/preloader-radical.scss';
 @use './general/effects.scss';
 @use './general/font.scss';
+@use './general/errors.scss';
 @use './general/icons/icons.scss';
 @use './general/header/_header.scss';
 @use './general/footer/_footer.scss';
diff --git a/src/styles/home/home.scss b/src/styles/home/home.scss
@@ -13,19 +13,19 @@
     align-content: center;
 
     .landing-bg {
-          position: relative;
-    z-index: -10;
-    top: 0;
-    width: 100vw;
-    height: 100%;
-    background: linear-gradient(to right, 
-    rgba(15, 18, 25, 0) 0%,
-    rgba(15, 18, 25, 0.5) 25%,  
-    rgba(15, 18, 25, 1) 50%,
-    rgba(15, 18, 25, 0.5) 75%,  
-    rgba(15, 18, 25, 0) 100%);;
-    /* Optional: Add a blur effect */
-    filter: blur(100px);
+      position: relative;
+      z-index: -10;
+      top: 0;
+      width: 100vw;
+      height: 100%;
+      background: linear-gradient(to right, 
+      rgba(15, 18, 25, 0) 0%,
+      rgba(15, 18, 25, 0.5) 25%,  
+      rgba(15, 18, 25, 1) 50%,
+      rgba(15, 18, 25, 0.5) 75%,  
+      rgba(15, 18, 25, 0) 100%);;
+      /* Optional: Add a blur effect */
+      filter: blur(100px);
     }
 
     p {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ footer {`
`17`	`17`
`18`	`18`	`#navigation {`
`19`	`19`	`font-size: $font-l;`
	`20`	`+`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`#contact-email {`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ footer {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`section:nth-child(1),section:nth-child(2),section:nth-child(3) {`
`74`		`- min-height: 14em;`
`75`		`- padding: 1em 4em;`
	`74`	`+ min-height: 300px;`
	`75`	`+ padding: 28px 36px;`
`76`	`76`	`text-align: left;`
`77`	`77`	`}`
`78`	`78`