Merge branch 'main' into STAT-866-licenses-qa

src/layouts/Layout.astro

@@ -7,8 +7,8 @@ import iconGitHub from '../assets/navigation/github.png'
 
 const links = [
   {
-    name: 'Values',
-    url: '/fsd/',
+    name: 'Definition',
+    url: '/definition/',
     target: ''
   },
   {
@@ -22,8 +22,8 @@ const links = [
     target: ''
   },
   {
-    name: 'Adopt Fair Source',
-    url: '/howto/',
+    name: 'Join',
+    url: '/join/',
     target: ''
   },
 ];

src/pages/companies.astro

@@ -20,8 +20,8 @@ const seoMetaData = {
         Explore the innovative companies that have adopted Fair Source.
       </p>
       <div class="flex flex-wrap flex-col md:flex-row w-12/12 mb-[11.44rem] gap-[1rem] justify-center">
-        <Button href="/howto" type="primary" cta="Adopt Fair Source"></Button>
-        <Button htef="/" type="secondary" color="black" cta="Add your Project" background="background"></Button>
+        <Button url="/join" type="primary" cta="Join Fair Source"></Button>
+        <Button url="https://github.com/fairsource/fair.io/issues" type="secondary" color="black" cta="Add Your Company" background="background"></Button>
       </div>
     </div>
     <div class="relative min-w-full overflow-visible z-0">
@@ -61,4 +61,4 @@ const seoMetaData = {
     </Section>
   </main>
 
-</Layout>
+</Layout>

src/pages/fsd.astro → src/pages/definition.astro

@@ -7,20 +7,20 @@ import GeoRight from '/images/background-images/geo-right.svg?raw';
 
 const seoMetaData = {
   description: 'Fair Source values user freedom and developer sustainability. We find a balance through non-compete licenses that allow users to run the software for their own needs, modify it, and propose changes back to the developer.',
-  slug: 'fsd/'
+  slug: 'definition/'
 };
 
 ---
 
-<Layout title="Fair Source Values" seo={seoMetaData}>
+<Layout title="Fair Source Definition" seo={seoMetaData}>
   <header class="w-full relative overflow-x-clip z-0">
     <div class="flex flex-wrap justify-center container mx-auto z-10 relative">
       <div class="w-10/12 lg:w-9/12 xl:w-8/12 py-[3rem] lg:py-[6rem] 2xl:pt-[12.19rem] 2xl:pb-[18.06rem] 3xl:pt-[8rem] 3xl:pb-[12rem] flex-col justify-center text-center z-1">
-        <h1>Fair Source Values</h1>
+        <h1>Fair Source Definition</h1>
         <p class="text-[1.75rem] font-[500] leading-[130%] tracking-[-0.035rem] mb-[1.5rem]">Explore the innovative companies that have adopted Fair Source.</p>
         <div class="flex flex-wrap items-center justify-center columns-2 gap-[1rem]">
-          <Button cta="Adopt Fair Source" url="/howto" type="primary" />
-          <Button cta="Add Your Project" url="https://github.com/fairsource/fair.io" type="secondary" />
+          <Button cta="Join Fair Source" url="/join" type="primary" />
+          <Button cta="Add Your Company" url="https://github.com/fairsource/fair.io" type="secondary" />
         </div>
       </div>
     </div>
@@ -55,4 +55,4 @@ const seoMetaData = {
 
   </Section>
 
-</Layout>
+</Layout>

src/pages/faq.astro

@@ -111,7 +111,7 @@ const seoMetaData = {
           </div>
         </Collapse>
         <Collapse 
-          title="Why should I adopt Fair Source for my product?" 
+          title="Why should I adopt Fair Source at my company?" 
           collapseID="collapse-3"
         >
           <div class="relative flex flex-wrap pb-[3rem]">
@@ -203,4 +203,4 @@ const seoMetaData = {
     </Section>
   </main>
 
-</Layout>
+</Layout>

src/pages/index.astro

@@ -26,7 +26,7 @@ const seoMeta = {
           </h1>
           <p class="text-balance text-black text-[1.5rem] xl:text-[2rem] leading-[130%] font-sans font-[500] mb-6">Balance innovation and protection with Fair Source licensing.</p>
           <div class="flex flex-wrap gap-4">
-            <Button type="primary" url='/howto' color="teal" cta="Adopt Fair Source" />
+            <Button type="primary" url='/join' color="teal" cta="Join Fair Source" />
             <Button type="secondary" url='/faq' color="black" cta="Learn More" />          
           </div>
         </div>
@@ -48,9 +48,9 @@ const seoMeta = {
       <div class="w-12/12 xl:w-1/2 xl:order-1">
         <div class="py-[3rem] md:py-[3rem] lg:py-[4rem] xl:py-[6rem] 2xl:py-[6.9rem]">
           <span class="text-teal tag">Embrace Fair Source</span>
-          <h2>Learn how to adopt Fair Source for your projects</h2>
+          <h2>Learn how to adopt Fair Source at your company</h2>
           <p class="mb-6">Whether you’re a developer looking to contribute or a business aiming to innovate, we the provide steps to successfully implement Fair Source in your projects. Join the community of ethical and innovative software sharing, balancing collaboration with control for everyone involved.</p>
-          <Button type="secondary" cta="adopt fair source" url="/howto" color="teal" />
+          <Button type="secondary" cta="join fair source" url="/join" color="teal" />
         </div>
       </div>
     </Section>

src/pages/howto.astro → src/pages/join.astro

@@ -9,16 +9,16 @@ import adoptHeroImage from '../assets/adopt/adoptHeroImage.png';
 
 const seoMetaData = {
   description: `Here's how to adopt Fair Source for your project.`,
-  slug: 'howto/'
+  slug: 'join/'
 };
 ---
 
-<Layout title="How to Adopt Fair Source" seo={seoMetaData}>
+<Layout title="Join Fair Source" seo={seoMetaData}>
   <header class="container relative px-[1.5rem] mx-auto flex flex-wrap lg:px-[3rem] overflow-clip">
 
     <div class="w-12/12 xl:w-5/12 py-[3rem] lg:py-[8rem] xl:pb-[15.25rem] xl:pt-[12.38rem]">
-      <h1 class="text-balance mb-[1rem]">How to Adopt Fair Source</h1>
-      <p class="text-[1.75rem] font-[500] leading-[130%] tracking-[0.035rem]">Sold on the <a href="/" class="underline">benefits</a>? Here's how to adopt Fair Source for your project.</p>
+      <h1 class="text-balance mb-[1rem]">Join Fair Source</h1>
+      <p class="text-[1.75rem] font-[500] leading-[130%] tracking-[0.035rem]">Sold on the <a href="/faq" class="underline">benefits</a>? Here's how to adopt Fair Source at your company.</p>
     </div>
     <div class="absolute hidden right-0 top-0 w-1/2 xl:block">
       <Image src={adoptHeroImage} alt="How to adopt fair source" densities={[1, 2, 3]}/>
@@ -159,4 +159,4 @@ const seoMetaData = {
   .glyph{
     padding-top: 5px;
   }
-</style>
+</style>