diff --git a/src/components/Abouthero.jsx b/src/components/Abouthero.jsx index 821373c..73b05f6 100644 --- a/src/components/Abouthero.jsx +++ b/src/components/Abouthero.jsx @@ -17,8 +17,13 @@ export default function Abouthero() {
+<<<<<<< HEAD

At OurVerse,
we go beyond traditional video calls.

+======= +

+ Beyond Traditional Video Calls.

+>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd

Our immersive decentralized metaverse platform brings people together in a dynamic, interactive environment where meetings and events feel REAL.

@@ -27,7 +32,11 @@ export default function Abouthero() {
>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd > Join OurVerse diff --git a/src/components/Aboutnodes.jsx b/src/components/Aboutnodes.jsx index 346220f..6bfb823 100644 --- a/src/components/Aboutnodes.jsx +++ b/src/components/Aboutnodes.jsx @@ -21,8 +21,15 @@ export default function Aboutnodes() {

>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd > Host a Node diff --git a/src/components/Bentosection.jsx b/src/components/Bentosection.jsx index 026af99..5de6429 100644 --- a/src/components/Bentosection.jsx +++ b/src/components/Bentosection.jsx @@ -67,12 +67,21 @@ export default function BentoSection() {

See Features +======= + href="/features.html" + className="rounded-2xl btn-dark px-3.5 py-2.5 text-base font-semibold text-white shadow-sm hover:bg-purple-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500" + > + See Features + + +>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd Read Use Cases
diff --git a/src/components/Bottom.jsx b/src/components/Bottom.jsx index 7335c40..96c719b 100644 --- a/src/components/Bottom.jsx +++ b/src/components/Bottom.jsx @@ -3,7 +3,11 @@ export default function Bottom() {
+<<<<<<< HEAD

+======= +

+>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd The Future of Collaboration
is now. @@ -13,8 +17,15 @@ export default function Bottom() {

>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd > Sign Up Now diff --git a/src/components/Button.jsx b/src/components/Button.jsx index e13b5f3..1320a3c 100644 --- a/src/components/Button.jsx +++ b/src/components/Button.jsx @@ -3,7 +3,11 @@ import clsx from 'clsx' export function Button({ className, ...props }) { className = clsx( +<<<<<<< HEAD 'inline-flex justify-center rounded-2xl btn-gradient-dark py-2 px-4 text-xs font-semibold text-white hover:btn-gradient-dark-hover focus:outline-none focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500 active:text-white/70', +======= + 'inline-flex justify-center rounded-2xl btn-dark py-4 px-3 text-sm font-semibold text-white hover:btn-dark-hover focus:outline-none focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500 active:text-white/70', +>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd className, ) diff --git a/src/components/Communhero.jsx b/src/components/Communhero.jsx index 87b76f4..05ed5aa 100644 --- a/src/components/Communhero.jsx +++ b/src/components/Communhero.jsx @@ -15,9 +15,15 @@ export default function Communhero() { {/* Content container with a higher z-index */}
+<<<<<<< HEAD

A United Community
Creating the Future of
Virtual Worlds +======= +
+

+ Create the Future of Virtual World Together +>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd

Join a global movement where visionaries, creators, and innovators come together to shape immersive digital experiences. @@ -29,7 +35,11 @@ export default function Communhero() {

>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd > Join OurVerse diff --git a/src/components/Cta.jsx b/src/components/Cta.jsx index 43d8da1..f002a92 100644 --- a/src/components/Cta.jsx +++ b/src/components/Cta.jsx @@ -20,10 +20,20 @@ export default function CTA() {
>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd > Be a Part of OurVerse +<<<<<<< HEAD +======= + + Visit ThreeFold + +>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
diff --git a/src/components/Eventbanner.jsx b/src/components/Eventbanner.jsx index c675b34..7a85606 100644 --- a/src/components/Eventbanner.jsx +++ b/src/components/Eventbanner.jsx @@ -18,16 +18,26 @@ export default function Eventbanner() {