Backport merge

gatsby-config.js

@@ -30,6 +30,14 @@ module.exports = {
         }
       }
     },
+    {
+      resolve: 'gatsby-plugin-your-fonts',
+      options: {
+        fonts: [
+          `gibson.css`
+        ]
+      }
+    },
     {
       resolve: `gatsby-plugin-material-ui`,
       options: {

netlify/collections/pages/affiliates.js

@@ -0,0 +1,26 @@
+export default {
+  name: 'affiliates',
+  label: 'affiliates',
+  folder: 'resources/content/affiliates',
+  create: false,
+  delete: false,
+  fields: [
+    {
+      label: 'Title',
+      name: 'title',
+      widget: 'string'
+    },
+    {
+      name: 'content',
+      label: 'affiliates page content',
+      widget: 'object',
+      fields: [
+        {
+          name: 'default_content',
+          label: 'Default content',
+          widget: 'string'
+        }
+      ]
+    }
+  ]
+}

netlify/collections/pages/index.js

@@ -5,12 +5,14 @@ import donations from './donations'
 import news from './news'
 import contact from './contact'
 import whoweare from './who-we-are'
+import affiliates from './affiliates'
 import home from './home'
 
 export default [
   notFound,
   home,
   whoweare,
+  affiliates,
   contact,
   news,
   donations,

package.json

@@ -71,6 +71,7 @@
     "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-standard": "^4.0.1",
     "express": "^4.17.1",
+    "gatsby-plugin-your-fonts": "^0.0.1",
     "portfinder": "^1.0.25",
     "react-icons": "^3.11.0",
     "webpack": "^4.42.1",

resources/content/global/global-en.md

@@ -7,6 +7,8 @@ global_content:
       global_navigation_item_link: /
     - global_navigation_item_title: Who we are
       global_navigation_item_link: /who-we-are/
+    - global_navigation_item_title: Affiliates
+      global_navigation_item_link: /affiliates/
     - global_navigation_item_title: Contact
       global_navigation_item_link: /contact/
     - global_navigation_item_title: News

resources/content/meta/affiliates.md

@@ -0,0 +1,8 @@
+---
+title: en (English) site content
+head:
+  title: Affiliates - Haskell Foundation
+  meta:
+    - { name: "twitter:title", content: "Affiliates - Haskell Foundation", file: "" }
+    - { name: "og:title", content: "Affiliates - Haskell Foundation", file: "" }
+---

resources/content/pages/affiliates/affiliates-en.md

@@ -0,0 +1,44 @@
+---
+about_title: en (English) affiliates page content
+about_content:
+  about_page_title: Affiliates
+  about_page_content: |
+    ### Affiliates
+
+    We invite existing Haskell projects, committees and communities to
+    explicitly affiliate and align themselves with the Haskell Foundation.
+    Affiliation means that the group supports the goals of the Haskell
+    Foundation, and that the Haskell Foundation in turn supports this group.
+    We require affiliated groups to adhere to guidelines around transparency,
+    being open to new members, and follow the
+    [Haskell committee guidelines for respectful communication](https://github.com/ghc-proposals/ghc-proposals/blob/master/GRC.rst).
+    We believe that this will help us grow towards being a more open and
+    welcoming community.
+
+    The following groups affiliated with the Haskell Foundation:
+
+     -  The [Haskell IDE Team](https://github.com/haskell/haskell-language-server)
+     -  The [GHC Steering Committee](https://github.com/ghc-proposals/ghc-proposals)
+     -  [Haskell Weekly](https://haskellweekly.news/)
+
+    The following groups are in the process of affiliating.  This means they
+    endorse the Haskell Foundation but are still in the process of adopting the
+    new guidelines:
+
+     -  The [Core Libraries Committee](https://wiki.haskell.org/Core_Libraries_Committee)
+     -  The [Haskell.org Committee](https://www.haskell.org/haskell-org-committee)
+     -  The Haskell Admins
+     -  [Cabal](https://www.haskell.org/cabal/)
+
+    This is not a closed list!  We very much want the Haskell Foundation to be
+    something by _all of us_.  Please [contact](/en/contact/) us if you are
+    interested in joining us in our quest to make Haskell better for everyone.
+
+    #### The Hackage Trustees
+
+    Placeholder text until the Hackage Trustees provide an official statement.
+
+    #### Volunteers
+
+    This is a placeholder for space we will use to include key volunteers who are not on the board or with one of the affiliated committees.
+---

resources/content/pages/board-of-directors/board-of-directors-en.md

@@ -1,7 +1,7 @@
 ---
-about_title: en (English) Board of Directors Nominations
+about_title: en (English) Board of Directors
 about_content:
-  about_page_title: Board of Directors Nominations
+  about_page_title: Board of Directors
   about_page_content: |
 
     ### The Haskell Foundation Board of Directors

resources/content/pages/contact/contact-en.md

@@ -3,5 +3,5 @@ contact_title: en (English) contact page content
 contact_content:
   contact_page_title: Contact
   contact_page_content: |
-    If you are interested in learning more about the haskell foundation, volunteering, or donating please contact us by email at contact@haskell.foundation
+    For general information or volunteer opportunites, please email us at contact@haskell.foundation. Does your company use Haskell? Email us at sponsorship@haskell.foundation.
 ---    

resources/content/pages/donations/donations-en.md

@@ -3,35 +3,38 @@ donations_title: en (English) donations page content
 donations_content:
   donations_page_title: Donations
   donations_page_content: |
-    If you or your organization are interested in providing support to the **Haskell Foundation** please contact us at *donations@haskell.foundation* to join the other supporters of the **Haskell Foundation**.
+    If you or your organization are interested in sponsoring the Haskell Foundation please contact us at *sponsorship@haskell.foundation* to start the conversation.
 
-    #### Supporting the **Haskell Foundation**
+    ### Supporting the **Haskell Foundation**
 
-    Many enterprises use Haskell and its compiler, the Glasgow Haskell Compiler (GHC), for free. In the spirit of open source, the **Haskell Foundation** provides an opportunity for those enterprises to give back to the community and toolchain from which they benefit. Maintaining and developing reliable toolchains take a huge amount of nitty-gritty engineering work.
+    Many enterprises use Haskell and its compiler, the Glasgow Haskell Compiler (GHC), for free. In the spirit of open source, the Haskell Foundation provides an opportunity for those enterprises to give back to the community and toolchain from which they benefit. Maintaining and developing reliable toolchains take a huge amount of nitty-gritty engineering work.
 
-    Donations to the **Haskell Foundation** are tax-deductible where applicable, and are used to sponsor our open source initiatives that ensure that research and development continues at the same world-class pace for years to come.
+    Donations to the Haskell Foundation are tax-deductible where applicable, and are used to sponsor our open source initiatives that ensure that research and development continues at the same world-class pace for years to come.
 
-    Contact *donations@haskell.foundation* to find out more about how you can support Haskell and the **Haskell Foundation**.
+    Contact *sponsorship@haskell.foundation* to find out more about how you can support Haskell and the Haskell Foundation.
 
-    #### Enterprise Support Tiers
 
-    Monad: $50K per year. All of the benefits of Functor and Applicative memberships, with the addition of a full interview for the **Haskell Foundation** blog, as well as having your logo prominently displayed on the HF website.
-    Applicative: $25K per year. Have your logo and story featured in the Supporter Spotlight on the website and newsletter, a medium-sized logo displayed on the HF website, and receive ongoing recognition on our social media pages.
-    Functor:  $10K per year. Receive ongoing acknowledgements on Social Media channels, and have a small logo displayed on the HF website.
+    ### Enterprise Support Tiers
 
-    #### In-Kind Support
-    Non-financial contributions to HF are very welcome. As a volunteer-based organization, the **Haskell Foundation** needs volunteers who can work on software, documentation, promotion, and other tasks to support the HF affiliated projects and the Haskell community. Individuals who contribute their own time or on behalf of their company are the backbone of our organization. Please reach out to us at [email protected] to learn more about how you can volunteer or offer in-kind support.
+    | ![Functor tier](../../../images/functor.png)      | ![Applicative tier](../../../images/applicative.png) | ![Monad tier](../../../images/monad.png) |
+    | --------------------- | ------------------------- | ------------------------ |
+    | Receive ongoing       | Have your logo and story               | All of the benefits of |
+    | acknowledgements on   | featured in the Supporter              | Functor and Applicative |
+    | social media channels | Spotlight on the website and           | memberships, with the addition |
+    | and have a small logo | newsletter, a medium- sized            | of a full interview for the |
+    | displayed on the HF   | logo displayed on the HF               | Haskell Foundation blog, as |
+    | website.              | website, and receive ongoing           | well as having your |
+    |                       | recognition on our social media pages. | logo prominently displayed on the HF website. |
+
+    ### In-Kind Support
 
-    #### Sponsors
+    Non-financial contributions to HF are very welcome. As a volunteer-based organization, the **Haskell Foundation** needs volunteers who can work on software, documentation, promotion, and other tasks to support the HF affiliated projects and the Haskell community. Individuals who contribute their own time or on behalf of their company are the backbone of our organization. Please reach out to us at [email protected] to learn more about how you can volunteer or offer in-kind support.
 
-    Github
-    Iohk
-    Tweag
-    Obsidian
-    Well Typed
-    SkillsMatter
-    Kadena
+    ### Individual Support
 
+    If you are an individual looking to donate, please contact us directly at [[email protected]](mailto:[email protected]). We have many great projects in need of in-kind support or financial contributions. We do not have donor tiers for individuals at this time.
 
+    ### How to Donate
 
----    
+    Contact us directly at [[email protected]](mailto:[email protected]) to find out more about how you can support Haskell and the **Haskell Foundation**.
+---

resources/content/pages/index/index-en.md

@@ -3,14 +3,10 @@ home_title: en (English) index page content
 home_content:
   home_video_id: re96UgMk6GQ
   home_intro: |
-    Haskell is not “just another programming language”: it embodies a radical and elegant attack on the entire enterprise of writing software. 
-
-    Purely functional programming is based on values rather than state, and is rigorously explicit about side effects (the source of so many bugs in production). 
-
-    Haskell is profoundly influencing the world of software for the better.
+    Haskell is not “just another programming language”: it embodies a radical and elegant attack on the entire enterprise of writing software. It profoundly influences the world of software for the better.
 
   home_claim: |
-    The Haskell Foundation seeks to articulate the benefits of functional programming to a much broader audience, to erase barriers to entry, and to make Haskell into a solidly reliable basis for mission critical applications.
+    **The Haskell Foundation** seeks to articulate the benefits of functional programming to a much broader audience, to erase barriers to entry, and to make Haskell into a solidly reliable basis for mission critical applications.
 
   home_goals:
     home_goals_title: "The Haskell Foundation pursues its goals with a strong ethos based on:"