From a69efcf93f66ffdc3a850a4671c1b75fb3e7594e Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 16 May 2023 11:18:07 +0200 Subject: Flesh out learn index And add a little bit of content. Still need to flesh out use & reuse --- assets/sass/_custom.scss | 2 +- content/_index.md | 2 +- content/learn/_index.md | 33 +++++++++++++++++++++++++++ content/learn/copyleft.md | 4 ++++ content/learn/licenses.md | 4 ++++ content/learn/participate/_index.md | 4 ++++ content/learn/participate/assets.md | 4 ++++ content/learn/participate/choose-a-license.md | 4 ++++ content/learn/participate/commercial.md | 4 ++++ content/learn/participate/contribute.md | 4 ++++ content/learn/participate/publish.md | 4 ++++ content/learn/use/_index.md | 4 ++++ layouts/partials/pager.html | 0 static/images/wfs-light.svg | 8 +++---- 14 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 content/learn/_index.md create mode 100644 content/learn/copyleft.md create mode 100644 content/learn/licenses.md create mode 100644 content/learn/participate/_index.md create mode 100644 content/learn/participate/assets.md create mode 100644 content/learn/participate/choose-a-license.md create mode 100644 content/learn/participate/commercial.md create mode 100644 content/learn/participate/contribute.md create mode 100644 content/learn/participate/publish.md create mode 100644 content/learn/use/_index.md create mode 100644 layouts/partials/pager.html diff --git a/assets/sass/_custom.scss b/assets/sass/_custom.scss index 7f1bab3..33f42e7 100644 --- a/assets/sass/_custom.scss +++ b/assets/sass/_custom.scss @@ -6,7 +6,7 @@ a { text-decoration: underline; } -a.button, nav a { +a.button, nav a, aside a { text-decoration: none; } diff --git a/content/_index.md b/content/_index.md index 81e1303..765479d 100644 --- a/content/_index.md +++ b/content/_index.md @@ -15,7 +15,7 @@ users and authors — the freedom to **use**, **study**, **improve**, and This website is a work in progress. {{< /tip >}} -{{< button "learn/whatis" "What is free software?" >}}{{< button "learn" "Get started" >}} +{{< button "learn" "What is free software?" >}}{{< button "learn/participate" "Get started" >}} {{< /column >}} {{< column >}} diff --git a/content/learn/_index.md b/content/learn/_index.md new file mode 100644 index 0000000..76c8eb7 --- /dev/null +++ b/content/learn/_index.md @@ -0,0 +1,33 @@ +--- +title: About Free Software +weight: 1 +--- + +> "Free software" is software developed & published according to principles +> which respect the essential rights and freedoms of its users and authors +> — the freedom to **use**, **study**, **improve**, and **share** the +> software. The **Free Software movement** is a global community +> of software developers and users who collaborate to build software according +> to these principles. + +Any software is considered free software so long as it upholds the *four +essential freedoms*: + +
    +
  1. + The freedom to use the software for any purpose. +
  2. +
  3. + The freedom to study and improve the + software. +
  4. +
  5. + The freedom to share the software. +
  6. +
  7. + The freedom to collaborate on the software. +
  8. +
+ +Software which upholds these freedoms is **free software**. Software which does +not is **non-free**. diff --git a/content/learn/copyleft.md b/content/learn/copyleft.md new file mode 100644 index 0000000..3c15ee1 --- /dev/null +++ b/content/learn/copyleft.md @@ -0,0 +1,4 @@ +--- +title: What is copyleft? +weight: -10 +--- diff --git a/content/learn/licenses.md b/content/learn/licenses.md new file mode 100644 index 0000000..5f5a48f --- /dev/null +++ b/content/learn/licenses.md @@ -0,0 +1,4 @@ +--- +title: Free software licenses +weight: -10 +--- diff --git a/content/learn/participate/_index.md b/content/learn/participate/_index.md new file mode 100644 index 0000000..d991078 --- /dev/null +++ b/content/learn/participate/_index.md @@ -0,0 +1,4 @@ +--- +title: "Getting involved" +weight: 2 +--- diff --git a/content/learn/participate/assets.md b/content/learn/participate/assets.md new file mode 100644 index 0000000..5b47716 --- /dev/null +++ b/content/learn/participate/assets.md @@ -0,0 +1,4 @@ +--- +title: Licensing non-software assets +weight: 10 +--- diff --git a/content/learn/participate/choose-a-license.md b/content/learn/participate/choose-a-license.md new file mode 100644 index 0000000..f1988ec --- /dev/null +++ b/content/learn/participate/choose-a-license.md @@ -0,0 +1,4 @@ +--- +title: Choosing a license +weight: 3 +--- diff --git a/content/learn/participate/commercial.md b/content/learn/participate/commercial.md new file mode 100644 index 0000000..f8b1bd7 --- /dev/null +++ b/content/learn/participate/commercial.md @@ -0,0 +1,4 @@ +--- +title: Commercial free software +weight: 100 +--- diff --git a/content/learn/participate/contribute.md b/content/learn/participate/contribute.md new file mode 100644 index 0000000..210ba9d --- /dev/null +++ b/content/learn/participate/contribute.md @@ -0,0 +1,4 @@ +--- +title: Contribute to free software +weight: 1 +--- diff --git a/content/learn/participate/publish.md b/content/learn/participate/publish.md new file mode 100644 index 0000000..fcbd542 --- /dev/null +++ b/content/learn/participate/publish.md @@ -0,0 +1,4 @@ +--- +title: Publish free software +weight: 2 +--- diff --git a/content/learn/use/_index.md b/content/learn/use/_index.md new file mode 100644 index 0000000..e368c98 --- /dev/null +++ b/content/learn/use/_index.md @@ -0,0 +1,4 @@ +--- +title: "Use & Reuse" +weight: 3 +--- diff --git a/layouts/partials/pager.html b/layouts/partials/pager.html new file mode 100644 index 0000000..e69de29 diff --git a/static/images/wfs-light.svg b/static/images/wfs-light.svg index e265581..f8792e7 100644 --- a/static/images/wfs-light.svg +++ b/static/images/wfs-light.svg @@ -24,9 +24,9 @@ inkscape:deskcolor="#505050" inkscape:document-units="px" showgrid="false" - inkscape:zoom="1.3696959" - inkscape:cx="421.62645" - inkscape:cy="70.453597" + inkscape:zoom="0.68484795" + inkscape:cx="743.96076" + inkscape:cy="152.58861" inkscape:window-width="1920" inkscape:window-height="1057" inkscape:window-x="0" @@ -58,7 +58,7 @@ transform="matrix(2.5,0,0,2.5,-912.34259,-75.238583)">Write Free SoftwareWrite Free Software