Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
lukefretwell committed Nov 20, 2024
1 parent 1448204 commit 0afde02
Show file tree
Hide file tree
Showing 81 changed files with 203 additions and 112 deletions.
Binary file modified .DS_Store
Binary file not shown.
19 changes: 12 additions & 7 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ linkedin: https://www.linkedin.com/company/proudlyserving
date: "%B %-d, %Y"
timezone: America/Los_Angeles

markdown: kramdown
highlighter: rouge
kramdown:
syntax_highlighter: rouge

# Build settings
plugins:
- jekyll-seo-tag
Expand Down Expand Up @@ -54,12 +59,12 @@ defaults:
short: "true"
schematype: "Article"
- scope:
path: "_people"
type: "people"
path: "_contributors"
type: "contributors"
values:
folder: "People"
img-path: "people"
parent: "people"
folder: "Contributors"
img-path: "contributors"
parent: "contributors"
layout: "profile"
short: "true"
schematype: "ProfilePage"
Expand All @@ -72,9 +77,9 @@ collections:
posts:
output: true
permalink: /news/:title
people:
contributors:
output: true
permalink: people/:title
permalink: contributors/:title
contents:
output: true
permalink: contents/:title
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions _data/book.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
docs_list_title: book
docs:

- title: Manuscript (Google Doc)
url: https://docs.google.com/document/d/1rruJsEF8-E3qTVCv0Giw2mK43HcNS4d7233rgGk9wjw/edit?usp=sharing
16 changes: 8 additions & 8 deletions _data/nav-footer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ docs:

-

- title: Contents
url: /contents/

- title: About
url: /about/
- title: Book
url: /book/

- title: People
url: /people/

- title: What they say
url: /what-they-say/
- title: Contributors
url: /contributors/

- title: What they're saying
url: /what-theyre-saying/

- title: News
url: /news/
Expand Down
8 changes: 4 additions & 4 deletions _data/nav-home.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
docs_list_title: nav-home
docs:

- title: Contents
url: /contents/
- title: About
url: /about/

- title: Book
url: /book/

- title: People
url: /people/
- title: Contributors
url: /contributors/
20 changes: 10 additions & 10 deletions _data/nav.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
docs_list_title: nav
docs:

- title: Contents
url: /contents/
- title: About
url: /about/

- title: Book
url: /book/
- title: Book
url: /book/

- title: People
url: /people/
- title: Contributors
url: /contributors/

- title: What they say
url: /what-they-say/
- title: What they're saying
url: /what-theyre-saying/

- title: News
url: /news/
- title: News
url: /news/
16 changes: 16 additions & 0 deletions _includes/book.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<div class="row">
<div class="col-12 col-sm-12 col-md-8 col-lg-8 col-xl-8">
{% if site.data.book.docs %}
<ul class="list-unstyled list-inline mb-3 pb-3">
{% for item in site.data.book.docs %}
{% if item.url %}
<li class="list-inline-item">
<a href="{{ site.baseurl }}{{ item.url }}" class="btn btn-primary">{{ item.title }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</div>
<div class="col-12 col-sm-12 col-md-4 col-lg-4 col-xl-4"></div>
</div>
File renamed without changes.
6 changes: 3 additions & 3 deletions _includes/card-quotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
{% if page.layout == "home" %}
{% for quotes in site.data.quotes.docs limit: 2 %}
<div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 d-flex align-items-stretch">
<div class="card mb-4 mx-1 my-1 border-0">
<div class="card mb-4 my-1 border-0">
<div class="card-body">
<div class="card-img-top card-img-top">
<img
src="{{ site.baseurl }}/assets/img/people/{{ quotes.img }}"
src="{{ site.baseurl }}/assets/img/contributors/{{ quotes.img }}"
class="rounded-circle sm float-start mx-3 mb-3 shadow"
alt="{{ item.name }}">
</div>
Expand All @@ -23,7 +23,7 @@
<div class="card-body">
<div class="card-img-top card-img-top">
<img
src="{{ site.baseurl }}/assets/img/people/{{ quotes.img }}"
src="{{ site.baseurl }}/assets/img/contributors/{{ quotes.img }}"
class="rounded-circle sm float-start mx-3 mb-3"
alt="{{ item.name }}">
</div>
Expand Down
6 changes: 3 additions & 3 deletions _includes/cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
{% endfor %}
</div>
<!-- People -->
{% elsif pull == "people" %}
{% elsif pull == "contributors" %}
<div class="card-group">
{% for item in site.people %}
{% include card-people.html %}
{% for item in site.contributors %}
{% include card-contributors.html %}
{% endfor %}
</div>
{% endif %}
Expand Down
82 changes: 55 additions & 27 deletions _includes/jumbotron.html
Original file line number Diff line number Diff line change
@@ -1,34 +1,62 @@
{% if page.layout == "home" %}
<div class="py-5">
<div class="container">
<div class="row">
<div class="col-12 col-sm-12 col-md-1 col-lg-1 col-xl-1"></div>
<div class="col-12 col-sm-12 col-md-4 col-lg-4 col-xl-4">
<img
alt="Cover of {{ page.title }}"
class="xl border shadow mb-4"
src="{{ site.baseurl }}/assets/img/cover.png">
</div>
<div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
<h1 class="mb-0 display-3">{{ page.title }}</h1>
{% if page.description %}
<p class="lead fs-1">{{ page.description }}</p>
{% endif %}
{% if site.data.nav-home.docs %}
<ul class="list-unstyled list-inline mt-3 pt-3">
{% for item in site.data.nav-home.docs %}
{% if item.url %}
<li class="list-inline-item">
<a href="{{ site.baseurl }}{{ item.url }}" class="btn btn-primary mb-2">{{ item.title }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</div>
<div class="container mb-5 pt-5 border-bottom">
<div class="row">
<div class="col-12 col-sm-12 col-md-1 col-lg-1 col-xl-1"></div>
<div class="col-12 col-sm-12 col-md-4 col-lg-4 col-xl-4">
<img
alt="Cover of {{ page.title }}"
class="xl border shadow mb-5"
src="{{ site.baseurl }}/assets/img/cover.png">
</div>
<div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
<h1 class="mb-0 display-3">{{ page.title }}</h1>
{% if page.description %}
<p class="lead fs-2">{{ page.description }}</p>
{% endif %}
{% if site.data.nav-home.docs %}
<ul class="list-unstyled list-inline mt-3 mb-5 pt-3">
{% for item in site.data.nav-home.docs %}
{% if item.url %}
<li class="list-inline-item">
<a href="{{ site.baseurl }}{{ item.url }}" class="btn btn-primary mb-2">{{ item.title }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</div>
</div>
<div class="col-12 col-sm-12 col-md-1 col-lg-1 col-xl-1"></div>
</div>
{% elsif page.layout == "book" %}
<div class="container mb-5 pt-5 border-bottom">
<div class="row">
<div class="col-12 col-sm-12 col-md-1 col-lg-1 col-xl-1"></div>
<div class="col-12 col-sm-12 col-md-4 col-lg-4 col-xl-4">
<img
alt="Cover of {{ page.title }}"
class="xl border shadow mb-5"
src="{{ site.baseurl }}/assets/img/cover.png">
</div>
<div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
<h1 class="mb-0 display-3">{{ page.title }}</h1>
{% if page.description %}
<p class="lead fs-2">{{ page.description }}</p>
{% endif %}
{% if site.data.book.docs %}
<ul class="list-unstyled list-inline mt-3 mb-5 pt-3">
{% for item in site.data.book.docs %}
{% if item.url %}
<li class="list-inline-item">
<a href="{{ site.baseurl }}{{ item.url }}" class="btn btn-primary mb-2">{{ item.title }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</div>
</div>
<div class="col-12 col-sm-12 col-md-1 col-lg-1 col-xl-1"></div>
</div>
{% elsif page.layout == "post" %}
<div class="bg-dark py-5 mb-5 text-white">
Expand Down
32 changes: 32 additions & 0 deletions _layouts/book.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
layout: default
---

{% if content %}
<div class="container border-bottom pb-5 mb-5">
<div class="row">
<div class="col-12 col-sm-12 col-md-3 col-lg-3 col-xl-3"></div>
<div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
{{ content }}
</div>
<div class="col-12 col-sm-12 col-md-3 col-lg-3 col-xl-3"></div>
</div>
</div>
{% endif %}
{% if site.data.contents.docs %}
<div class="col-12">
<h2 class="mb-4">Contents</h2>
{% for section in site.data.contents.docs %}
<h3>{{ section.name | capitalize }}</h3>
<div class="card-group mt-4 mb-5">
{% for chapter in section.chapters %}
{% for item in site.contents %}
{% if item.title == chapter %}
{% include card-contents.html %}
{% endif %}
{% endfor %}
{% endfor %}
</div>
{% endfor %}
</div>
{% endif %}
14 changes: 7 additions & 7 deletions _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% include nav.html %}
<main>
{% include jumbotron.html %}
<div class="container border-top pt-5 pb-5">
<div class="container">
<div class="row">
<div class="col-12 col-sm-12 col-md-1 col-lg-1 col-xl-1"></div>
<div class="col-12 col-sm-12 col-md-4 col-lg-4 col-xl-4 text-center">
Expand All @@ -21,10 +21,10 @@ <h2 class="mb-3">Purpose</h2>
<div class="col-12 col-sm-12 col-md-1 col-lg-1 col-xl-1"></div>
</div>
</div>
<div class="container border-top pt-5">
<div class="container border-top pt-5 mt-5">
<div class="row">
<div class="col-12">
<h2 class="mb-3">What they say</h2>
<h2 class="mb-3">What they're saying</h2>
</div>
</div>
<div class="row">
Expand All @@ -34,7 +34,7 @@ <h2 class="mb-3">What they say</h2>
</div>
<div class="row">
<div class="col-sm-12">
<a href="{{ site.baseurl }}/what-theyre-saying/" class="btn btn-primary">What they say</a>
<a href="{{ site.baseurl }}/what-theyre-saying/" class="btn btn-primary">What they're saying</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -64,10 +64,10 @@ <h3>{{ section.name | capitalize }}</h3>
<div class="container border-top pt-5">
<div class="row">
<div class="col-sm-12">
<h2>People</h2>
<h2>Contributors</h2>
<div class="card-group mt-4 mb-5">
{% for item in site.people %}
{% include card-people.html %}
{% for item in site.contributors %}
{% include card-contributors.html %}
{% endfor %}
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</div>
</div>
{% if page.launched %}
<div class="container border-bottom mb-5 pb-4">
<div class="container">
<div class="row">
<div class="col-12">
<h2>Read</h2>
Expand Down Expand Up @@ -55,7 +55,7 @@ <h2>Feedback</h2>
</div>
{% endif %}
{% if page.author %}
<div class="container">
<div class="container border-top mt-5 pt-5">
<div class="row">
<div class="col-12 mb-3">
<h2>Author</h2>
Expand All @@ -65,15 +65,15 @@ <h2>Author</h2>
{% endif %}
{% if page.author %}
{% for author in page.author %}
{% assign author_data = site.people | where: "title", author | first %}
{% assign author_data = site.contributors | where: "title", author | first %}
{% if author_data.content.size > 1 %}
<div class="container mb-5">
<div class="row">
<div class="col-12 col-sm-12 col-md-3 col-lg-3 col-xl-3">
{% if author_data.img %}
<div class="img">
<a href="{{ site.baseurl }}{{ author_data.url }}"><img
src="{{ site.baseurl }}/assets/img/people/{{ author_data.img }}"
src="{{ site.baseurl }}/assets/img/contributors/{{ author_data.img }}"
alt="Photo of {{ author_data.title }}"
title="{{ author_data.title }}"
class="md rounded-circle shadow mb-5"></a>
Expand Down
Loading

0 comments on commit 0afde02

Please sign in to comment.