Merge branch 'main' of https://github.com/raisfeld-ori/d_vault

ksed_website/app/routes/_index.tsx

@@ -99,11 +99,11 @@ export default function Index() {
         </div>
       </div>
       <div className="column" style={{justifyContent: "unset"}}>
+      <div className="exception"><h1 id="whatis" className="pop">What is Ksed?</h1></div>
        <div id="text0"className="ilegaltext left">Secure</div>
         <div id="text1"className="ilegaltext right">Beautiful</div>
         <div id="text2"className="ilegaltext left">Easy to use</div>
         <div id="text3"className="ilegaltext right">Safe</div>
-        <div className="exception"><h1 id="whatis" className="pop">that, is what ksed is about</h1></div>
       </div>
       <div className="square">
       <div className="squareinsquare">

ksed_website/app/routes/about.tsx

@@ -2,6 +2,24 @@ import './style/about.css';
 
 
 export default function About(){
+<<<<<<< HEAD
+    return       <div className="square">
+    <p className="explanation">
+      Lorem ipsum dolor sit, amet consectetur adipisicing elit. 
+      Quaerat temporibus a incidunt in error blanditiis sit vero, 
+      ut quisquam perspiciatis, 
+      iste culpa alias beatae aperiam cum dolores, numquam ad accusamus?
+      Lorem ipsum dolor sit amet consectetur adipisicing elit. 
+      Ipsam provident autem sapiente quae quibusdam, corporis inventore tenetur beatae 
+      voluptatem nulla commodi itaque neque in earum culpa quia laudantium doloribus! Ex.
+      Lorem ipsum dolor sit amet consectetur adipisicing elit. Labore ratione dolorum eaque 
+      temporibus asperiores repellat aliquam voluptate iste quas hic
+       deleniti fugit quaerat quisquam quidem, ipsa autem dolor rem deserunt.
+    </p>
+    <div className="justicediv"> <img id="justice" src="alpha.jpeg" alt="" /></div>
+
+</div>
+=======
     return <div className="square">
         <h1 className="text head">about Ksed:</h1>
         <p className="text body">
@@ -29,4 +47,5 @@ Something in the way, hmm-mmm
 Something in the way, yeah, hmm-mmm
 </p>
     </div>
+>>>>>>> df25f98ab578e76f6d41e72b0fd3f9fbf5ad8c1e
 }

ksed_website/app/routes/style/index.css

@@ -342,6 +342,8 @@ user-select: none;
     font-size: 4em;
     margin-bottom: 5svh;
     color: #134676;
+    text-shadow: 0px 5px 5px rgba(0, 0, 0, 0.603);
+
 }
 
 .whatis:hover {
@@ -384,5 +386,10 @@ user-select: none;
   .explanation{
     text-align: center;
     font-size: 0.9em;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+
 
-  }
+  }