Skip to content

Commit

Permalink
Merge branch 'OpenCilk:main' into jfc/reducers
Browse files Browse the repository at this point in the history
  • Loading branch information
VoxSciurorum authored Jul 25, 2022
2 parents 3ba2c6d + 8fc2fdf commit aadd493
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/_includes/layouts/base.njk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="d-flex row flex-nowrap">
{% if sidebar %}
<div class="col-auto p-0">
<div id="sidebar" class="collapse show h-100 px-3 pt-0" style="margin-left: 1em; max-width: 280px; border-right-width: 2; border-right-style: solid; border-color: var(--lime);">
<div id="sidebar" class="collapse show h-100 px-3 pt-0" style="margin-left: 1em; min-width: 200px; max-width: 300px; border-right-width: 2; border-right-style: solid; border-color: var(--lime);">
{% set sidebarCode = ["partials/sidebar-", sidebar, ".njk"] | join %}
{% include sidebarCode %}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/community/index.md → src/community.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
layout: layouts/page.njk
title: Community
sidebar: toc
background: bg-white
eleventyNavigation:
key: Community
parent: Home
Expand Down Expand Up @@ -33,5 +34,4 @@ Below are the academic conferences traditionally most popular with the OpenCilk



See also: **[Contribute](/contribute)**.

See also: **[Contribute](/contribute)**.
2 changes: 1 addition & 1 deletion src/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ eleventyNavigation:
order: 7
---

The OpenCilk project welcomes your expertise and enthusiasm. A few specific opportunities are listed below. If you see anything interesting, or have ideas that we haven't thought of, please contact us on the [OpenCilk discussion forum](https://github.com/OpenCilk/opencilk-project/discussions).
The OpenCilk project welcomes your expertise and enthusiasm. A few specific opportunities are listed below. If you see anything interesting, or have ideas that we haven't thought of, please [contact us](/contribute/contact/).

## Testing
We are interested in your experiences or issues in installing and writing code and running OpenCilk programs.
Expand Down
13 changes: 13 additions & 0 deletions src/contribute/contact.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
layout: layouts/page.njk
title: Contact us
eleventyNavigation:
key: Contact
order: 0
---

Do you have questions or comments about OpenCilk, our open-source community, or software performance engineering?

Please email us at [`contact@opencilk.org`](mailto:contact@opencilk.org). We would love to hear from you.

(See also [Community](/community/) and [Contribute](/contribute/).)
9 changes: 9 additions & 0 deletions src/contribute/contribute.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"layout": "layouts/page.njk",
"sidebar": "toc",
"background": "bg-white",
"permalink": "/contribute/{{ page.fileSlug | slugify }}/",
"eleventyNavigation": {
"parent": "Contribute"
}
}

0 comments on commit aadd493

Please sign in to comment.