Skip to content

Commit

Permalink
Merge pull request #13 from elijames-codecov/STAT-866-licenses-qa
Browse files Browse the repository at this point in the history 
Stat 866 licenses qa
  • Loading branch information
@elijames-codecov
elijames-codecov committed Aug 2, 2024
2 parents 8672073 + a124b4b commit e8c90f5
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 29 deletions.
2 changes: 1 addition & 1 deletion public/images/grid/false.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/images/grid/true.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/grid/false.png
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions src/assets/grid/false.svg
View file

This file was deleted.

Binary file removed src/assets/grid/true.png
View file
Binary file not shown.
Binary file removed src/assets/grid/truthy.png
View file
Binary file not shown.
Binary file added src/assets/licenses/licenses-hero-image.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/pages/join.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const seoMetaData = {
<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]}/>
<Image src={adoptHeroImage} alt="How to adopt fair source" densities={[1, 2, 3]}/>
</div>
</header>
<main>
Expand Down
66 changes: 45 additions & 21 deletions src/pages/licenses.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,38 @@ import Layout from '../layouts/Layout.astro';
import Section from '../components/Section.astro';
import { Image } from 'astro:assets';
import HeroImage from '../assets/licenses/licenses-hero-image.png';
import FSL from '../assets/licenses/FSL-initials.png';
import Licenses1 from '../assets/licenses/licenses-1.png';
import IsTrue from '/images/grid/true.svg?raw';
import IsFalse from '/images/grid/false.svg?raw';
const seoMetaData = {
description: 'We have vetted and approved the following licenses and approaches as fitting our Fair Source Values. While other licenses and approaches may also fit our values, these are the ones we recommend for adoption.',
slug: 'licenses/'
};
const gridText = 'text-[1.375rem] font-[500] leading-[120%] tracking-[-0.03438rem]';
const glyphWrapper = 'relative w-[24px] h-[24px] xl:w-[40px] xl:h-[40px]';
const gridText = 'text-[0.75rem] text-left font-[600] leading-[135%] tracking-[-0.01125rem] xl:text-[1.375rem] font-[500] xl:leading-[120%] xl:tracking-[-0.03438rem]';
const gridRow = 'flex flex-wrap w-12/12 pl-[1rem] pr-[0.5rem] xl:px-[2rem] items-center h-[4rem]';
const card = 'border border-borderGray rounded-small px-[1rem] py-[1.5rem] xl:px-[2rem] xl:py-[3rem] h-[100%]';
const cardTitleClasses = `font-sans text-[1.375rem] font-[500] color-black leading-[120%] tracking-[-0.03438rem] flex items-center mb-[0.62rem]`;
const gridHeaderText = 'block text-[0.75rem] font-[600] leading-[120%] tracking-[-0.01125rem] xl:text-[1.375rem] xl:tracking-[-0.03438rem]';
---

<Layout title="Fair Source Licenses" seo={seoMetaData}>
<header>
<div class="relative container-spill md:pl-[1.5rem] lg:pl-[3rem]">
<div class="relative flex">
<div class="w-12/12 py-[7rem] lg:pt-[15.96rem] lg:pb-[17.56rem] lg:w-4/12">
<div class="w-12/12 py-[7rem] 2xl:pt-[15.96rem] 2xl:pb-[17.56rem] lg:w-4/12">
<h1>Fair Source Licenses</h1>
</div>
<div class=""></div>
</div>
<div class="lg:absolute hidden lg:block right-0 bottom-0 top-0 xl:top-0 xl:bottom-[-10rem] w-7/12 ">
<Image src={HeroImage} alt="How to adopt fair source" densities={[1, 2, 3]}/>
</div>
</div>
</header>
<main>
Expand Down Expand Up @@ -98,80 +106,96 @@ const cardTitleClasses = `font-sans text-[1.375rem] font-[500] color-black leadi
</div>
<div>
<h3 class="tag text-tangerine">Approaches</h3>
<p class="pb-[1.5rem] xl:pb-[3rem]">We differentiate Fair Source licensing approaches based on two factors. First, does the producer utilize eventual Open Source? Second, does the producer limit the features of its Fair Source product relative to other editions of the software? Limiting features is called “Fair Core,” because the core functionality is available under a Fair Source license, while an extended feature set is not. This amounts to whether the company’s business model includes monetizing self-hosted usage.</p>
<p class="pb-[1.5rem] text-[0.9375rem] font-[500] leading-[135%] tracking-[-0.01406rem] xl:text-[1.375rem] xl:tracking-[-0.03438rem] xl:pb-[3rem] ">We differentiate Fair Source licensing approaches based on two factors. First, does the producer utilize eventual Open Source? Second, does the producer limit the features of its Fair Source product relative to other editions of the software? Limiting features is called “Fair Core,” because the core functionality is available under a Fair Source license, while an extended feature set is not. This amounts to whether the company’s business model includes monetizing self-hosted usage.</p>
<div class="w-full pb-[1.5rem]">
<div class="flex flex-wrap w-12/12 px-[2rem] h-[4.5rem] items-center">
<div class={gridRow}>
<div class="w-2/12 h-[100%] flex items-center">
<span class="block text-[1.375rem] font-[600] leading-[120%] tracking-[-0.03438rem]">Tier</span>
<span class={gridHeaderText}>Tier</span>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<span class="block text-[1.375rem] font-[600] leading-[120%] tracking-[-0.03438rem]">Eventual OSS</span>
<span class={gridHeaderText}>Eventual OSS</span>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<span class="block text-[1.375rem] font-[600] leading-[120%] tracking-[-0.03438rem]">Feautre Complete</span>
<span class={gridHeaderText}>Feautre Complete</span>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<span class="block text-[1.375rem] font-[600] leading-[120%] tracking-[-0.03438rem]">Examples</span>
<span class={gridHeaderText}>Examples</span>
</div>
</div>
<div class="flex flex-wrap w-12/12 px-[2rem] items-center h-[4rem]">
<div class={gridRow}>
<div class="w-2/12 h-[100%] flex items-center">
<span class={gridText}>1</span>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsTrue} />
<div class={glyphWrapper}>
<Fragment set:html={IsTrue} class="w-[100%] h-auto" />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsTrue} />
<div class={glyphWrapper}>
<Fragment set:html={IsTrue} />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<span class={gridText}>FSL, BUSL<sup>†</sup></span>
</div>
</div>
<div class="flex flex-wrap w-12/12 px-[2rem] items-center h-[4rem] bg-backgroundGray">
<div class={`${gridRow} bg-backgroundGray rounded-xs`}>
<div class="w-2/12 h-[100%] flex items-center">
<span class={gridText}>2</span>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsTrue} />
<div class={glyphWrapper}>
<Fragment set:html={IsTrue} />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsFalse} />
<div class={glyphWrapper}>
<Fragment set:html={IsFalse} />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<span class={gridText}>FCL</span>
</div>
</div>
<div class="flex flex-wrap w-12/12 px-[2rem] items-center h-[4rem]">
<div class={gridRow}>
<div class="w-2/12 h-[100%] flex items-center">
<span class={gridText}>3</span>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsFalse} />
<div class={glyphWrapper}>
<Fragment set:html={IsFalse} />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsTrue} />
<div class={glyphWrapper}>
<Fragment set:html={IsTrue} />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<span class={gridText}>SSPL, ELv2<sup>†</sup>, BUSL<sup>†</sup></span>
</div>
</div>
<div class="flex flex-wrap w-12/12 px-[2rem] items-center h-[4rem] bg-backgroundGray">
<div class={`${gridRow} bg-backgroundGray rounded-xs`}>
<div class="w-2/12 h-[100%] flex items-center">
<span class={gridText}>4</span>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsFalse} />
<div class={glyphWrapper}>
<Fragment set:html={IsFalse} />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<Fragment set:html={IsFalse} />
<div class={glyphWrapper}>
<Fragment set:html={IsFalse} />
</div>
</div>
<div class="w-3/12 h-[100%] flex items-center">
<span class={gridText}>ELv2<sup>†</sup>, BUSL<sup>†</sup></span>
</div>
</div>
</div>
<p class='text-gray text-[1.375rem] font-[500] leading-[120%] tracking-[-0.03438rem]'><sup>†</sup> Depends on implementation</p>
<p class='text-gray text-[0.75rem] tracking-[-0.01875rem] xl:text-[1.375rem] font-[500] leading-[120%] xl:tracking-[-0.03438rem]'><sup>†</sup> Depends on implementation</p>
</div>


Expand Down
3 changes: 2 additions & 1 deletion tailwind.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export default {
},
borderRadius: {
DEFAULT: '2rem',
small: '1rem'
small: '1rem',
xs: '0.5rem'
},
fontFamily: {
'sans': ['"Plus Jakarta Sans"', 'Arial', 'Helvetica', 'sans-serif'],
Expand Down

0 comments on commit e8c90f5

Please sign in to comment.