From 75085bad7b13c5416bb72caecd53bbe4995e785b Mon Sep 17 00:00:00 2001 From: Jasna Date: Sun, 4 Sep 2022 15:35:31 -0400 Subject: [PATCH 1/3] Add steering committee cta to about page --- _data/about.yml | 4 ++-- _data/cta.yml | 3 +++ _data/description.yml | 4 ++-- _data/nav-scala.yml | 3 +++ _includes/_cta-steering.html | 15 +++++++++++++++ _includes/_section-about.html | 11 +---------- about/index.html | 4 +++- steering.md => steering-committee.md | 8 +++++--- 8 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 _includes/_cta-steering.html rename steering.md => steering-committee.md (69%) diff --git a/_data/about.yml b/_data/about.yml index 8d7677c9..ee24e7c2 100644 --- a/_data/about.yml +++ b/_data/about.yml @@ -1,5 +1,5 @@ - title: "Open source" - description: "Independent, free/libre and open-source software" + description: "Independent, free/libre, and open-source software" icon: /img/assets/icon-about-open-source.svg - title: "Functional" @@ -15,7 +15,7 @@ icon: /img/assets/icon-about-resources.svg - title: "Friendly" - description: "An inclusive, welcoming and safe environment" + description: "An inclusive, welcoming, and safe environment" icon: /img/assets/icon-about-friendly.svg - title: "Modular" diff --git a/_data/cta.yml b/_data/cta.yml index dcb694a3..4badb8a4 100644 --- a/_data/cta.yml +++ b/_data/cta.yml @@ -9,3 +9,6 @@ blogDescription: If you want to share something about a library or Scala topics conductTitle: Scala Code of Conduct conductDescription: We are committed to providing a friendly, safe and welcoming environment for all, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, sexual identity and orientation, or other such characteristics. + +steeringTitle: Steering Committee +steeringDescription: The Typelevel Steering Committee is a group of volunteers that governs Typelevel. \ No newline at end of file diff --git a/_data/description.yml b/_data/description.yml index 3a8964c3..89f6f40f 100644 --- a/_data/description.yml +++ b/_data/description.yml @@ -1,11 +1,11 @@ aboutTitle: About -aboutDescription: Learn more about the organization. Here you can see the main goals we are pursuing. +aboutDescription: Learn more about the organization, including our main goals, code of conduct, and governance. projectsTitle: Projects projectsDescription: Our projects cover a wide range of domains, from general functional programming to tooling. blogTitle: Latest blog posts -blogDescription: We show how to use our libraries in your code, provide examples, collect learning resources and explore implementation details. +blogDescription: In addition to org-level announcements, here we show you how to use our libraries in your code, provide examples, collect learning resources, and explore implementation details. eventsTitle: Events diff --git a/_data/nav-scala.yml b/_data/nav-scala.yml index e617768f..fe399404 100644 --- a/_data/nav-scala.yml +++ b/_data/nav-scala.yml @@ -3,3 +3,6 @@ - title: License url: /license + +- title: Steering Committee + url: /steering-committee diff --git a/_includes/_cta-steering.html b/_includes/_cta-steering.html new file mode 100644 index 00000000..422a2b26 --- /dev/null +++ b/_includes/_cta-steering.html @@ -0,0 +1,15 @@ +
+
+
+

{{site.data.cta.steeringTitle}}

+

{{site.data.cta.steeringDescription}}

+ {% for item in site.data.nav-scala %} + {% if item.title == "Steering Committee" %} +


+ About the Committee +

+ {% endif %} + {% endfor %} +
+
+
\ No newline at end of file diff --git a/_includes/_section-about.html b/_includes/_section-about.html index 09e6365b..860381c4 100644 --- a/_includes/_section-about.html +++ b/_includes/_section-about.html @@ -4,17 +4,8 @@

{{site.data.description.aboutTitle}}

{{{site.data.description.aboutDescription}}

-
- {% for item in site.data.about %} -
- -

{{item.title}}

-

{{item.description}}

-
- {% endfor %} -
- See about + About Typelevel
diff --git a/about/index.html b/about/index.html index f24b6bb1..b6fb6caa 100644 --- a/about/index.html +++ b/about/index.html @@ -32,4 +32,6 @@

{{item.title}}

-{% include _cta-conduct.html %} \ No newline at end of file +{% include _cta-conduct.html %} +


+{% include _cta-steering.html %} \ No newline at end of file diff --git a/steering.md b/steering-committee.md similarity index 69% rename from steering.md rename to steering-committee.md index 858c4b66..8cb95e9c 100644 --- a/steering.md +++ b/steering-committee.md @@ -1,12 +1,14 @@ --- -layout: page -title: Typelevel Steering Committee +layout: coc +title: "Typelevel Steering Committee" +permalink: /steering-committee.html --- -The Typelevel Steering Committee is the group of volunteers that +The Typelevel Steering Committee is a group of volunteers that governs Typelevel. The membership is kept in [the Typelevel Governance repository][steering-committee] and described in the [Typelevel Charter][charter]. [steering-committee]: https://github.com/typelevel/governance/blob/main/STEERING-COMMITTEE.md [charter]: https://github.com/typelevel/governance/blob/main/CHARTER.md + From cbefccb2b6bb1429a4d9852ffddfaf0d4a81f73f Mon Sep 17 00:00:00 2001 From: Jasna RodulfaBlemberg Date: Tue, 6 Sep 2022 09:41:53 -0400 Subject: [PATCH 2/3] Update _data/cta.yml Co-authored-by: Sam Pillsworth --- _data/cta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/cta.yml b/_data/cta.yml index 4badb8a4..fe8afae2 100644 --- a/_data/cta.yml +++ b/_data/cta.yml @@ -11,4 +11,4 @@ conductTitle: Scala Code of Conduct conductDescription: We are committed to providing a friendly, safe and welcoming environment for all, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, sexual identity and orientation, or other such characteristics. steeringTitle: Steering Committee -steeringDescription: The Typelevel Steering Committee is a group of volunteers that governs Typelevel. \ No newline at end of file +steeringDescription: The Typelevel Steering Committee is a group of volunteers that govern Typelevel. \ No newline at end of file From 3750890202f52d8ad086a108781e0710e9fbf6f4 Mon Sep 17 00:00:00 2001 From: Jasna RodulfaBlemberg Date: Tue, 6 Sep 2022 09:42:02 -0400 Subject: [PATCH 3/3] Update steering-committee.md Co-authored-by: Sam Pillsworth --- steering-committee.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steering-committee.md b/steering-committee.md index 8cb95e9c..d2d7b39f 100644 --- a/steering-committee.md +++ b/steering-committee.md @@ -5,7 +5,7 @@ permalink: /steering-committee.html --- The Typelevel Steering Committee is a group of volunteers that -governs Typelevel. The membership is kept in [the Typelevel +govern Typelevel. The membership is kept in [the Typelevel Governance repository][steering-committee] and described in the [Typelevel Charter][charter].