Skip to content

Commit

Permalink
Merge pull request #39 from chadwhitacre/cwlw/about-tweaks
Browse files Browse the repository at this point in the history
Tweak the About page
  • Loading branch information
elijames-codecov committed Aug 5, 2024
2 parents 6e9d2f7 + a0188b4 commit 9867b62
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 63 deletions.
4 changes: 2 additions & 2 deletions src/components/Button.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const {type, cta, url, color, target, background = 'transparent'} = Astro.props;
const anchorTagClassList = `no-underline flex grow basis-[100%] lg:grow-0 lg:basis-auto lg:table-cell no-underline`;
const commonClassList = `px-6 py-4 rounded-small text-[1.25rem] font-[600] leading-[130%] tracking-[-0.025rem] capitalize w-full xl:w-auto`;
const commonClassList = `px-6 py-4 rounded-small text-[1.25rem] font-[600] leading-[130%] tracking-[-0.025rem] w-full xl:w-auto`;
const primaryClassList = `bg-black border-2 border-black ${commonClassList} text-white hover:opacity-80`;
const secondaryClassList = `${commonClassList} bg-${background} border-2 border-${color} text-${color} hover:opacity-80`;
const buttonTaupeClassList = `${commonClassList} bg-taupe text-black hover:opacity-80`;
Expand All @@ -27,4 +27,4 @@ const classList = (type) => {
<button class:list={`${classList(type)}`}>
{cta}
</button>
</a>
</a>
7 changes: 6 additions & 1 deletion src/pages/about.astro
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
import Button from '../components/Button.astro';
import Layout from '../layouts/Layout.astro';
import Section from '../components/Section.astro';
import GeoLeft from '/images/background-images/geo-left.svg?raw';
Expand Down Expand Up @@ -34,7 +35,7 @@ const seoMetaData = {
<main>
<Section sectionStyles="py-[3rem] px-[5rem] xl:pt-[5.5rem] xl:pb-[11.25rem] xl:px-[14.25rem]">
<div>
<h2>What is Fair Source Software?</h2>
<h2>Fair Source Definition</h2>
<p
class="text-[1.75rem] font-[500] leading-[135%] tracking-[-0.0375rem] pb-[1.25rem]"
>
Expand Down Expand Up @@ -108,6 +109,10 @@ const seoMetaData = {
href="https://github.com/fairsource/fair.io">in the README</a
>.
</p>

<div class="justify-center flex mt-[3rem] mb-[3rem]">
<Button url="/faq/" type="secondary" color="black" cta="Continue to the FAQ"></Button>
</div>
</div>
</div>

Expand Down
58 changes: 0 additions & 58 deletions src/pages/definition.astro

This file was deleted.

4 changes: 2 additions & 2 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const mobileSectionContentClasses = 'z-10 pt-[1.5rem] pb-[1rem] relative w-12/12
<div class="section-body-spacing">
<p>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>
</div>
<Button type="secondary" cta="join fair source" url="/join" color="teal" />
<Button type="secondary" cta="Join Fair Source" url="/join" color="teal" />
</div>
</Section>

Expand All @@ -77,7 +77,7 @@ const mobileSectionContentClasses = 'z-10 pt-[1.5rem] pb-[1rem] relative w-12/12
<div class="section-body-spacing">
<p>Looking for detailed information about Fair Source? Discover in-depth answers and insights to help you fully understand its benefits and applications. From licensing details to implementation tips, find everything you need to make the most of Fair Source.</p>
</div>
<Button type="secondary" cta="learn more" url="/faq" color="orange" />
<Button type="secondary" cta="Learn More" url="/faq" color="orange" />
</div>
</Section>
</main>
Expand Down

0 comments on commit 9867b62

Please sign in to comment.