Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _data/about.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions _data/cta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 govern Typelevel.
4 changes: 2 additions & 2 deletions _data/description.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 3 additions & 0 deletions _data/nav-scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

- title: License
url: /license

- title: Steering Committee
url: /steering-committee
15 changes: 15 additions & 0 deletions _includes/_cta-steering.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<section id="section-blog" class="section-large">
<div class="container">
<div class="section-header">
<h2><span>{{site.data.cta.steeringTitle}}</span></h2>
<p>{{site.data.cta.steeringDescription}}</p>
{% for item in site.data.nav-scala %}
{% if item.title == "Steering Committee" %}
<p><br />
<a class="button button-primary" href="{{item.url | relative_url }}">About the Committee</a>
</p>
{% endif %}
{% endfor %}
</div>
</div>
</section>
11 changes: 1 addition & 10 deletions _includes/_section-about.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,8 @@
<h2><span>{{site.data.description.aboutTitle}}</span></h2>
<p>{{{site.data.description.aboutDescription}}</p>
</div>
<div class="about-list">
{% for item in site.data.about %}
<div class="about-item" data-aos="fade-down">
<img src="{{ site.baseurl }}{{ item.icon }}" title="{{ item.title }}" />
<h3>{{item.title}}</h3>
<p>{{item.description}}</p>
</div>
{% endfor %}
</div>
<div class="section-cta">
<a class="button button-primary" href="{{ site.baseurl }}/about/">See about</a>
<a class="button button-primary" href="{{ site.baseurl }}/about/">About Typelevel</a>
</div>
</div>
</section>
4 changes: 3 additions & 1 deletion about/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ <h3>{{item.title}}</h3>
</div>
</div>
</div>
{% include _cta-conduct.html %}
{% include _cta-conduct.html %}
<br /><br /><br />
{% include _cta-steering.html %}
10 changes: 6 additions & 4 deletions steering.md → steering-committee.md
Original file line number Diff line number Diff line change
@@ -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
governs Typelevel. The membership is kept in [the Typelevel
The Typelevel Steering Committee is a group of volunteers that
govern 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