diff --git a/ksed_website/app/routes/_index.tsx b/ksed_website/app/routes/_index.tsx index a9e3859..5b97781 100644 --- a/ksed_website/app/routes/_index.tsx +++ b/ksed_website/app/routes/_index.tsx @@ -99,11 +99,11 @@ export default function Index() {
+

What is Ksed?

Secure
Beautiful
Easy to use
Safe
-

that, is what ksed is about

diff --git a/ksed_website/app/routes/about.tsx b/ksed_website/app/routes/about.tsx index 1f6a164..eb08c28 100644 --- a/ksed_website/app/routes/about.tsx +++ b/ksed_website/app/routes/about.tsx @@ -2,6 +2,24 @@ import './style/about.css'; export default function About(){ +<<<<<<< HEAD + return
+

+ 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. +

+
+ +
+======= return

about Ksed:

@@ -29,4 +47,5 @@ Something in the way, hmm-mmm Something in the way, yeah, hmm-mmm

+>>>>>>> df25f98ab578e76f6d41e72b0fd3f9fbf5ad8c1e } \ No newline at end of file diff --git a/ksed_website/app/routes/style/index.css b/ksed_website/app/routes/style/index.css index 472c734..8ab2061 100644 --- a/ksed_website/app/routes/style/index.css +++ b/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; + + - } \ No newline at end of file + }