Merge pull request #2 from shamshitty/new

New
invisyarcticfox · Nov 10, 2023 · 1941518 · 1941518
2 parents 41ff9cd + a839f9d
commit 1941518
Show file tree

Hide file tree

Showing 37 changed files with 368 additions and 225 deletions.
diff --git a/404.html b/404.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>404</title>
+    <link rel="shortcut icon" href="https://shamshitty.xyz/assets/avatar2.png" type="image/x-icon">
+    <link rel="stylesheet" href="https://shamshitty.xyz/assets/master.css">
+</head>
+<body style="margin: 20px;">
+    woops, you hit a 404. thats either my fault or yours <br>
+    heres a <a href="https://shamshitty.xyz">home page</a> link
+</body>
+</html>
diff --git a/assets/_vars.scss b/assets/_vars.scss
@@ -0,0 +1,7 @@
+$bg: #141414;
+$bg2: #000;
+$fg: #fff;
+$lgrey: #aaa;
+$accent: #0e0;
+$av-wh: 500px;
+$outline: 5px solid;
diff --git a/assets/blender/img/ballcubes.png → assets/bAndV/img/ballcubes.png b/assets/blender/img/ballcubes.png → assets/bAndV/img/ballcubes.png
diff --git a/assets/blender/img/carwall.png → assets/bAndV/img/carwall.png b/assets/blender/img/carwall.png → assets/bAndV/img/carwall.png
diff --git a/assets/blender/img/m_phone1.png → assets/bAndV/img/m_phone1.png b/assets/blender/img/m_phone1.png → assets/bAndV/img/m_phone1.png
diff --git a/assets/blender/img/m_phone2.png → assets/bAndV/img/m_phone2.png b/assets/blender/img/m_phone2.png → assets/bAndV/img/m_phone2.png
diff --git a/assets/blender/img/m_phone3.png → assets/bAndV/img/m_phone3.png b/assets/blender/img/m_phone3.png → assets/bAndV/img/m_phone3.png
diff --git a/assets/blender/img/m_string1.png → assets/bAndV/img/m_string1.png b/assets/blender/img/m_string1.png → assets/bAndV/img/m_string1.png
diff --git a/assets/blender/img/m_string2.png → assets/bAndV/img/m_string2.png b/assets/blender/img/m_string2.png → assets/bAndV/img/m_string2.png
diff --git a/assets/blender/img/m_string3.png → assets/bAndV/img/m_string3.png b/assets/blender/img/m_string3.png → assets/bAndV/img/m_string3.png
diff --git a/assets/bAndV/styles/_mobile.scss b/assets/bAndV/styles/_mobile.scss
@@ -0,0 +1,19 @@
+@media screen and (max-width: 720px){
+  h1 {
+    font-size: 40px;
+  }
+  .cont {
+    width: 90%;
+
+    span {
+      font-size: 20px;
+      margin-bottom: 25px;
+    }
+    img, video {
+      width: 100%;
+    }
+    .vnote {
+      font-size: 20px;
+    }
+  }
+}
diff --git a/assets/bAndV/styles/custom.css b/assets/bAndV/styles/custom.css
@@ -0,0 +1,51 @@
+body {
+  text-align: center;
+  margin-bottom: 100px;
+}
+
+h1 {
+  margin-top: 50px;
+  font-size: 60px;
+}
+
+.cont {
+  width: 75%;
+  margin: 0 auto;
+}
+.cont span {
+  font-size: 30px;
+  display: block;
+  margin-bottom: 50px;
+}
+.cont img, .cont video {
+  margin: 10px auto;
+}
+.cont .vnote {
+  font-size: 25px;
+}
+
+.divider {
+  width: 85%;
+  height: 1px;
+  background: #aaa;
+  margin: 20px auto;
+}
+
+@media screen and (max-width: 720px) {
+  h1 {
+    font-size: 40px;
+  }
+  .cont {
+    width: 90%;
+  }
+  .cont span {
+    font-size: 20px;
+    margin-bottom: 25px;
+  }
+  .cont img, .cont video {
+    width: 100%;
+  }
+  .cont .vnote {
+    font-size: 20px;
+  }
+}/*# sourceMappingURL=custom.css.map */
diff --git a/assets/bAndV/styles/custom.css.map b/assets/bAndV/styles/custom.css.map
diff --git a/assets/blender/custom.scss → assets/bAndV/styles/custom.scss b/assets/blender/custom.scss → assets/bAndV/styles/custom.scss
@@ -1,33 +1,38 @@
+@import '../../vars';
+
+
 body {
   text-align: center;
-
-  #back {
-    text-align: left !important;
-  }
+  margin-bottom: 100px;
 }
 
 h1 {
   margin-top: 50px;
-  font-size: 2.5em;
+  font-size: 60px;
 }
 
 .cont {
   width: 75%;
   margin: 0 auto;
 
   span {
-    font-size: 1.75em;
+    font-size: 30px;
     display: block;
-    margin-bottom: 35px;
+    margin-bottom: 50px;
   }
   img, video {
     margin: 10px auto;
   }
-
+  .vnote {
+    font-size: 25px;
+  }
 }
 .divider {
   width: 85%;
   height: 1px;
-  background: #aaa;
+  background: $lgrey;
   margin: 20px auto;
-}
+}
+
+
+@import './mobile';
diff --git a/assets/blender/vid/bacon.mp4 → assets/bAndV/vid/bacon.mp4 b/assets/blender/vid/bacon.mp4 → assets/bAndV/vid/bacon.mp4
diff --git a/assets/blender/vid/ballcubes.mp4 → assets/bAndV/vid/ballcubes.mp4 b/assets/blender/vid/ballcubes.mp4 → assets/bAndV/vid/ballcubes.mp4
diff --git a/assets/blender/vid/carwall.mp4 → assets/bAndV/vid/carwall.mp4 b/assets/blender/vid/carwall.mp4 → assets/bAndV/vid/carwall.mp4
diff --git a/assets/blender/vid/cingles.mp4 → assets/bAndV/vid/cingles.mp4 b/assets/blender/vid/cingles.mp4 → assets/bAndV/vid/cingles.mp4
diff --git a/assets/bAndV/vid/crump.mp4 b/assets/bAndV/vid/crump.mp4
diff --git a/assets/bAndV/vid/crush.mp4 b/assets/bAndV/vid/crush.mp4
diff --git a/assets/blender/vid/m_throwc.mp4 → assets/bAndV/vid/m_throwc.mp4 b/assets/blender/vid/m_throwc.mp4 → assets/bAndV/vid/m_throwc.mp4
diff --git a/assets/blender/vid/m_throwp.mp4 → assets/bAndV/vid/m_throwp.mp4 b/assets/blender/vid/m_throwp.mp4 → assets/bAndV/vid/m_throwp.mp4
diff --git a/assets/blender/vid/omg.mp4 → assets/bAndV/vid/omg.mp4 b/assets/blender/vid/omg.mp4 → assets/bAndV/vid/omg.mp4
diff --git a/assets/blender/vid/toilet.mp4 → assets/bAndV/vid/toilet.mp4 b/assets/blender/vid/toilet.mp4 → assets/bAndV/vid/toilet.mp4
diff --git a/assets/bAndV/vid/you.mp4 b/assets/bAndV/vid/you.mp4
diff --git a/assets/blender/custom.css b/assets/blender/custom.css
diff --git a/assets/blender/custom.css.map b/assets/blender/custom.css.map
diff --git a/assets/index/custom.css b/assets/index/custom.css
diff --git a/assets/index/custom.css.map b/assets/index/custom.css.map
diff --git a/assets/index/custom.scss b/assets/index/custom.scss
diff --git a/assets/index/styles/_mobile.scss b/assets/index/styles/_mobile.scss
@@ -0,0 +1,35 @@
+@media screen and (max-width: 720px){
+  body {
+    margin: 0 10px;
+  }
+
+  main {
+    transform: translate(0%, 15vh);
+
+    h1 {
+      font-size: 50px;
+    }
+    .desc {
+      font-size: 20px;
+    }
+  }
+
+  #links {
+    width: 90%;
+    font-size: 25px;
+
+    div {
+      width: 90%;
+      a {
+        &::after {
+          left: 45%;
+          width: 10%;
+        }
+        &:hover::after {
+          width: 25%;
+          left: 37.5%;
+        }
+      }
+    }
+  }
+}