Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update projects #156

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ node_modules
.jekyll-cache

# Ruby
.bundle
.bundle
179 changes: 100 additions & 79 deletions _data/data.yml

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion _test/data/test_01_projects_vs_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ projects:
image: "img/projects/tuf_diagram.png"
site: "https://theupdateframework.github.io"
status: *stealth
description: "Software must be updated frequently to not only ensure"
description:
- "Software must be updated frequently to not only ensure"
products: "TUF is used in production by"
people:
- *justin_cappos
Expand Down
3 changes: 2 additions & 1 deletion _test/data/test_02_project_list_vs_str.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ projects:
image: "img/projects/tuf_diagram.png"
site: "https://theupdateframework.github.io"
status: *stealth
description: "Software must be updated frequently to not only ensure"
description:
- "Software must be updated frequently to not only ensure"
products: "TUF is used in production by"
people:
- *justin_cappos
Expand Down
3 changes: 2 additions & 1 deletion _test/data/test_03_misspelled_alias.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ projects:
image: "img/projects/tuf_diagram.png"
site: "https://theupdateframework.github.io"
status: *stealth
description: "Software must be updated frequently to not only ensure"
description:
- "Software must be updated frequently to not only ensure"
products: "TUF is used in production by"
people:
- *justin_cappos
Expand Down
3 changes: 2 additions & 1 deletion _test/data/test_04_unescaped_quotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ projects:
image: "img/projects/tuf_diagram.png"
site: "https://theupdateframework.github.io"
status: *stealth
description: "Software must be updated frequently to not only ensure"
description:
- "Software must be updated frequently to not only ensure"
products: "TUF is used in production by"
people:
- *justin_cappos
Expand Down
3 changes: 2 additions & 1 deletion _test/data/test_05_alias_instead_of_str.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ projects:
site: "https://theupdateframework.github.io"
status: *stealth
description: "Software must be updated frequently to not only ensure"
products: "TUF is used in production by"
products:
- "TUF is used in production by"
people:
- *justin_cappos
tags:
Expand Down
3 changes: 2 additions & 1 deletion _test/data/test_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ projects:
image: "img/projects/tuf_diagram.png"
site: "https://theupdateframework.github.io"
status: *stealth
description: "Software must be updated frequently to not only ensure"
description:
- "Software must be updated frequently to not only ensure"
products: "TUF is used in production by"
people:
- *justin_cappos
Expand Down
2 changes: 1 addition & 1 deletion _test/yamale_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ project:
image: str(required=False)
site: str(required=False)
status: include('status')
description: str()
description: list(str())
products: str()
people: list(any(include('person'), include('proj_person')))
tags: list(include('tag'))
Expand Down
4 changes: 4 additions & 0 deletions css/projects.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
font-weight: bold;
font-size: 1.2rem;
}

h5 {
font-family: 'Bebas Neue', Helvetica, Arial, sans-serif;
}
}

/* Tooltips - http://www.w3schools.com/howto/howto_css_tooltip.asp */
Expand Down
1 change: 1 addition & 0 deletions overview.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: Overview
subnav: overview
permalink: /overview/
layout: default
---

Expand Down
1 change: 1 addition & 0 deletions people.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: People
subnav: people
permalink: /people/
layout: default
---
<link rel="stylesheet" href="{{ site.baseurl }}css/people.css">
Expand Down
1 change: 1 addition & 0 deletions press.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: Press
subnav: press
permalink: /press/
layout: default
---

Expand Down
26 changes: 13 additions & 13 deletions projects.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: Projects
subnav: projects
permalink: /projects/
layout: default
---

Expand Down Expand Up @@ -58,22 +59,22 @@ <h3><a href="#{{ project.anchor }}"> {{ project.name | size_upcase }} </a></h3>
<img class="image" src="{{ project.image }}"></img>
{% endif %}

<div class="description"><p>
{{ project.description }}
</p></div>
<div class="description">
{% for desc in project.description %}
<p>
{{ desc }}
</p>
{% endfor %}
</div>

<ul>
{% if project.products %}
<li>
<span class="header">Products: </span>
<span class="products">{{ project.products }}</span>
</li>
<h5 class="header">Products</h5>
<p class="products">{{ project.products }}</p>
{% endif %}

{% if project.people %}
<br />
<li><div class="people">
<span class="header">People: </span>
<div class="people">
<h5 class="header">People</h5>
{% assign personLinks = '' | split:':' %}
{% for person in project.people %}
{% if person == nil %}
Expand All @@ -87,9 +88,8 @@ <h3><a href="#{{ project.anchor }}"> {{ project.name | size_upcase }} </a></h3>
{% endfor %}

{{ personLinks | array_to_sentence_string }}
</div></li>
</div>
{% endif %}
</ul>
</div>
{% endfor %}
<div class="project">
Expand Down
1 change: 1 addition & 0 deletions publications.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: Publications
subnav: publications
permalink: /publications/
layout: default
---

Expand Down