Merge pull request #31 from elijames-codecov/eli/fixes

Eli/fixes
elijames-codecov · Aug 5, 2024 · e53b8c9 · e53b8c9
2 parents e4e279a + 7183831
commit e53b8c9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/public/images/icons/hamburger.svg b/public/images/icons/hamburger.svg
diff --git a/src/components/Collapse.astro b/src/components/Collapse.astro
@@ -15,7 +15,7 @@ const { title, collapseID, isLast = false } = Astro.props;
     aria-expanded="false"
     aria-controls={`${collapseID} accordion menu content`}
   >
-    <h2 class="text-[2.5rem] font-[500] leading-[125%] tracking-[-0.05rem] mb-0">{title}</h2>
+    <h2 class="font-[500] leading-[125%] tracking-[-0.05rem] mb-0">{title}</h2>
     <Image src={minus} format="svg" alt="close" loading="lazy" class="close-icon hidden" />
     <Image src={plus} format="svg" alt="open" loading="lazy" class="open-icon" />
   </button>

diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -53,7 +53,7 @@ const { title, seo } = Astro.props;
 
 const seoTitle = `${title} | Fair.io`;
 const seoDescription = seo?.description ? seo.description : '';
-const seoMetaImage = seo?.metaImage ? seo.metaImage : 'https://new.fair.io/images/metaimage.png';
+const seoMetaImage = seo?.metaImage ? seo.metaImage : 'https://fair.io/images/metaimage.png';
 const seoSlug = seo?.slug ? seo.slug : '';
 
 const canonicalURL = `https://fair.io/${seoSlug}`;
@@ -78,7 +78,7 @@ const canonicalURL = `https://fair.io/${seoSlug}`;
     <meta name='twitter:description' content={seoDescription}/>
     <meta name="twitter:image" content={seoMetaImage}/>
     <link rel="canonical" href={canonicalURL}/>
-		<title>{title}</title>
+		<title>{seoTitle}</title>
     <script
       defer
       data-domain="fair.io"

diff --git a/src/pages/about.astro b/src/pages/about.astro
@@ -82,7 +82,7 @@ const seoMetaData = {
 
           <h3>Why Fair Source?</h3>
 
-          <p>
+          <p class="pb-[1.5rem]">
             The purpose of Fair Source is to legitimize the practice of
             companies meaningfully sharing the code for their core software
             products while retaining control of their roadmap and business

diff --git a/src/pages/companies.astro b/src/pages/companies.astro
@@ -36,7 +36,7 @@ const seoMetaData = {
         </h2>
       </div>
       {
-        companies && <div class="flex flex-wrap columns-1 md:columns-2 lg:columns-3 pb-[5rem] gap-[2.5rem] justify-center">
+        companies && <div class="flex flex-wrap columns-1 md:columns-2 lg:columns-3 pb-[5rem] gap-y-[2.5rem] gap-x-[2.5rem] md:gap-x-[1rem] md:gap-y-[3rem] justify-center">
           {
             companies.map((company) => (
               <CarouselCard company={company} border />           

diff --git a/src/pages/faq.astro b/src/pages/faq.astro
@@ -263,10 +263,10 @@ const seoMetaData = {
         </Collapse>
         <Collapse
           title="How does Fair Source benefit developers?"
-          collapseID="collapse-5"
+          collapseID="how-developers-benefit"
         >
           <div class="relative flex flex-wrap pb-[3rem]">
-            <p class="text-[1.5rem] tracking-[-0.0375rem] mb-[2rem]">
+            <p>
               With minimal restrictions to protect the producer's business
               model, developers can read, use, modify, and redistribute Fair
               Source Software. Developers can propose modifications back to the
@@ -279,7 +279,7 @@ const seoMetaData = {
         </Collapse>
         <Collapse
           title="Is Fair Source software safe to use?"
-          collapseID="collapse-6"
+          collapseID="is-fair-source-safe"
           isLast
         >
           <div class="relative flex flex-wrap pb-[3rem]">

diff --git a/src/pages/licenses.astro b/src/pages/licenses.astro
@@ -68,17 +68,17 @@ const cardTitleClasses = `font-sans text-[1.375rem] font-[500] color-black leadi
       </div>
       <div class="w-12/12 lg:w-6/12 mb-[1.25rem] lg:pr-[0.72rem]">
         <div class={card}>
-          <h4 class={cardTitleClasses}><span class="mr-[0.69rem] font-[600]">Fair Core Licence (FCL)</span> <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" fill="none">
+          <a href="https://fcl.dev/" target="_BLANK"><h4 class={cardTitleClasses}><span class="mr-[0.69rem] font-[600]">Fair Core Licence (FCL)</span><svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" fill="none">
             <path d="M1 2H13M13 2V14M13 2L1 14" stroke="black" stroke-width="2.3"/></span>
-            </svg></h4>
+            </svg></h4></a>
           <p>A simple non-compete license with two-year delayed conversion to Open Source. Consider it for monetizing self-hosted software.</p>
         </div>
       </div>
       <div class="w-12/12 lg:w-6/12 mb-[1.25rem] lg:pl-[0.72rem]">
         <div class={card}>
-          <h4 class={cardTitleClasses}><span class="mr-[0.69rem] font-[600]">Business Source License (BUSL or BSL)</span> <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" fill="none">
+          <a href="https://mariadb.com/bsl-faq-mariadb/" target="_BLANK"><h4 class={cardTitleClasses}><span class="mr-[0.69rem] font-[600]">Business Source License (BUSL or BSL)</span><svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" fill="none">
             <path d="M1 2H13M13 2V14M13 2L1 14" stroke="black" stroke-width="2.3"/></span>
-            </svg></h4>
+            </svg></h4></a>
           <p>A complex non-compete license with eventual Open Source conversion after a certain amount of time, usually four years.</p>
         </div>
       </div>