From bb8a2fec2467b65aa56fdd6cf987349f751468b2 Mon Sep 17 00:00:00 2001 From: Eli Lennox Date: Wed, 31 Jul 2024 17:46:56 -0400 Subject: [PATCH] ready for review --- src/components/Button.astro | 17 ++++- src/layouts/Layout.astro | 2 +- src/pages/licenses.astro | 123 +++++++++++++++++++----------------- tailwind.config.mjs | 4 +- 4 files changed, 86 insertions(+), 60 deletions(-) diff --git a/src/components/Button.astro b/src/components/Button.astro index 18005ca..b4c7774 100644 --- a/src/components/Button.astro +++ b/src/components/Button.astro @@ -4,11 +4,26 @@ const {type, cta, url, color, target} = Astro.props; const commonClassList = `px-6 py-4 rounded-small text-[1.25rem] font-[600] leading-[130%] tracking-[-0.025rem] capitalize`; const primaryClassList = `bg-black border-2 border-black ${commonClassList} text-white hover:opacity-80`; const secondaryClassList = `${commonClassList} border-2 border-${color} text-${color} hover:opacity-80`; +const buttonTaupeClassList = `${commonClassList} bg-taupe text-black hover:opacity-80`; + +const classList = (type) => { + switch(type) { + case 'primary': + return primaryClassList; + break; + case 'taupe': + return buttonTaupeClassList; + break; + default: + return secondaryClassList; + break; + } +} --- - \ No newline at end of file diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index e47826c..460b984 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -203,7 +203,7 @@ const { title } = Astro.props; } .tag { display: block; - font-family: 'Plus Jakarta Sans', Arial, Helvetica, sans-serif; + font-family: 'Outfit', Arial, Helvetica, sans-serif; font-size: 1.5rem; font-style: normal; font-weight: 500; diff --git a/src/pages/licenses.astro b/src/pages/licenses.astro index 692ff24..024e021 100644 --- a/src/pages/licenses.astro +++ b/src/pages/licenses.astro @@ -6,18 +6,19 @@ import { Image } from 'astro:assets'; import FSL from '../assets/licenses/FSL-initials.png'; import Licenses1 from '../assets/licenses/licenses-1.png'; -import True from '../assets/grid/truthy.png'; -import False from '../assets/grid/false.png'; import IsTrue from '/images/grid/true.svg?raw'; import IsFalse from '/images/grid/false.svg?raw'; +const gridText = 'text-[1.375rem] font-[500] leading-[120%] tracking-[-0.03438rem]'; +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]`; ---
-
+

Fair Source Licenses

@@ -25,14 +26,14 @@ import IsFalse from '/images/grid/false.svg?raw';
-
-
+
+
-

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.

+

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.

-
-
+
+
Fair Source License
@@ -41,124 +42,132 @@ import IsFalse from '/images/grid/false.svg?raw';
Functional Source License
-
+
Recommended

Functional Source License (FSL)

A simple non-compete license with eventual Open Source conversion after two years. This is the flagship Fair Source license.

- + Visit Website + +
-
+

Alternate Fair Source Licenses

These licenses provide different terms and features, catering to specific project needs. They are useful alternatives for projects requiring unique conversion timelines or feature restrictions, offering flexibility beyond our main recommendation.

-
-

Fair Core Licence (FCL)

+
+

Fair Core Licence (FCL) + +

A simple non-compete license with two-year delayed conversion to Open Source. Recommended for monetizing self-hosted software.

-
-

Business Source License (BUSL or BSL)

+
+

Business Source License (BUSL or BSL) + +

A complex non-compete license with eventual Open Source conversion after a certain amount of time, usually four years.

-
-

Server Side Public License (SSPL)

+
+

Server Side Public License (SSPL) + +

A complex license derived from the GNU General Public License (GPL), designed to extend the share-alike principle to its maximum extent.

-
-

Elastic License (EL)

+
+

Elastic License (EL) + +

A simple non-compete license allowing feature restriction through license keys, suitable for various monetization models.

Approaches

-

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.

-
-
-
+

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.

+
+
+
Tier
-
+
Eventual OSS
-
+
Feautre Complete
-
+
Examples
-
-
- 1 +
+
+ 1
-
+
-
+
-
- FSL, BUSL† +
+ FSL, BUSL†
-
-
- 2 +
+
+ 2
-
+
-
+
-
- FCL +
+ FCL
-
-
- 3 +
+
+ 3
-
+
-
+
-
- SSPL, ELv2†, BUSL† +
+ SSPL, ELv2†, BUSL†
-
-
- 4 +
+
+ 4
-
+
-
+
-
- ELv2†, BUSL† +
+ ELv2†, BUSL†
-
- - +

† Depends on implementation

diff --git a/tailwind.config.mjs b/tailwind.config.mjs index 272553b..aa8c3fd 100644 --- a/tailwind.config.mjs +++ b/tailwind.config.mjs @@ -18,7 +18,9 @@ export default { rust: '#BB3E04', purple: '#6E5494', white: '#ffffff', - borderGray: 'rgba(0,0,0,.16)' + borderGray: 'rgba(0,0,0,.16)', + backgroundGray: 'rgba(202, 202, 229, 0.15)', + gray: '#526471' }, borderRadius: { DEFAULT: '2rem',