ASGHDIJASHDKJAS

css/index.css

@@ -7,47 +7,6 @@
 @import url(themes/macchiato.css);
 @import url(themes/mocha.css);
 
-<<<<<<< HEAD
-/* Index.html */
-
-html,
-body {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 1.5rem 1rem;
-  height: 100%;
-  width: 100%;
-  overflow: hidden;
-  font-family: "Comic Code", sans-serif;
-  overflow-x: hidden;
-  max-width: 100vw;
-  margin: 0;
-  min-height: 100vh;
-  background: linear-gradient(
-    135deg,
-    var(--base) 0%,
-    var(--mantle) 60%,
-    var(--crust) 100%
-  );
-  color: var(--text);
-}
-
-html {
-  background: linear-gradient(
-    135deg,
-    var(--base) 0%,
-    var(--mantle) 60%,
-    var(--crust) 100%
-  );
-}
-
-.hub {
-  position: auto;
-  z-index: 1;
-  width: 100%;
-  max-width: 460px;
-=======
 *,
 *::before,
 *::after {
@@ -82,7 +41,6 @@ main.intro,
     width: 100%;
     max-width: 480px;
     z-index: 1;
->>>>>>> 6b0bc5fa96491155661b1597bd88fedf1bace6b8
 }
 
 .pfp {
@@ -188,19 +146,6 @@ body::before {
 }
 
 @media (max-width: 600px) {
-<<<<<<< HEAD
-  .intro {
-    margin-top: 10vh;
-    color: var(--text);
-    text-align: center;
-    padding: 5vh;
-  }
-
-  .intro-text {
-    margin-top: 1vh;
-    padding: 1vh;
-  }
-=======
     .intro {
         color: var(--text);
         text-align: center;
@@ -215,7 +160,6 @@ body::before {
     .hub-header h1 {
         font-size: 1.7rem;
     }
->>>>>>> 6b0bc5fa96491155661b1597bd88fedf1bace6b8
 }
 
 @media (min-width: 768px) {
@@ -302,23 +246,12 @@ body::before {
 }
 
 .button-wall img {
-<<<<<<< HEAD
-  width: 88px;
-  height: 31px;
-  image-rendering: pixelated;
-  border: 1px solid var(--surface-1);
-  border-radius: 2px;
-  transition:
-    transform 0.12s ease,
-    border-color 0.12s ease;
-=======
     width: 88px;
     height: 31px;
     image-rendering: pixelated;
     border: 1px solid var(--surface-1);
     border-radius: 2px;
     transition: transform 0.12s ease, border-color 0.12s ease;
->>>>>>> 6b0bc5fa96491155661b1597bd88fedf1bace6b8
 }
 
 .button-wall a:hover img {
@@ -343,18 +276,6 @@ body.message-page {
 }
 
 .message-card {
-<<<<<<< HEAD
-  background: var(--surface0);
-  padding: 2.5rem;
-  border-radius: 12px;
-  max-width: 520px;
-  width: 100%;
-  box-shadow: 0 20px 60px rgba(0, 0, 0, 0.45);
-  text-align: center;
-  line-height: 1.6;
-  color: var(--text);
-  border: 1px solid var(--surface1);
-=======
     background: var(--surface-0);
     padding: 2.5rem;
     border-radius: 12px;
@@ -365,7 +286,6 @@ body.message-page {
     line-height: 1.6;
     color: var(--text);
     border: 1px solid var(--surface-1);
->>>>>>> 6b0bc5fa96491155661b1597bd88fedf1bace6b8
 }
 
 .message-card h1 {
@@ -375,11 +295,7 @@ body.message-page {
 }
 
 .message-card p {
-<<<<<<< HEAD
-  color: var(--subtext1);
-=======
     color: var(--subtext-1);
->>>>>>> 6b0bc5fa96491155661b1597bd88fedf1bace6b8
 }
 
 .message-card .ok {
@@ -393,15 +309,9 @@ body.message-page {
 }
 
 .message-card .muted {
-<<<<<<< HEAD
-  color: var(--overlay1);
-  font-size: 0.9rem;
-  margin-top: 1.5rem;
-=======
     color: var(--overlay-1);
     font-size: 0.9rem;
     margin-top: 1.5rem;
->>>>>>> 6b0bc5fa96491155661b1597bd88fedf1bace6b8
 }
 
 .message-card code {
@@ -435,5 +345,3 @@ body.message-page {
     padding: 1.75rem 1.5rem;
   }
 }
-
-/* end of code from security.girlsnetwork.dev/coffee */