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

v1.3.2 #297

Merged
merged 7 commits into from
Jan 6, 2025
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
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@

Reference: common-changelog.org

## 1.3.2 - 2025-01-06

### Changed

- Misc enhancements and bug fixes.

## 1.3.1 - 2024-11-11

### Changed

- Update and improve workflows for building site and citations
- Escape user inputs better in rare edge cases
- Update and improve workflows for building site and citations.
- Escape user inputs better in rare edge cases.

## 1.3.0 - 2024-08-16

Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# citation metadata for the template itself

title: "Lab Website Template"
version: 1.3.1
date-released: 2024-11-11
version: 1.3.2
date-released: 2025-01-06
url: "https://github.com/greenelab/lab-website-template"
authors:
- family-names: "Rubinetti"
Expand Down
Binary file modified _cite/.cache/cache.db
Binary file not shown.
8 changes: 7 additions & 1 deletion _data/types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# team member roles

pi:
principal-investigator:
icon: fa-solid fa-microscope
description: Principal Investigator

Expand Down Expand Up @@ -96,6 +96,12 @@ twitter:
tooltip: Twitter
link: https://twitter.com/$VALUE

bluesky:
icon: fa-brands fa-bluesky
text: Bluesky
tooltip: Bluesky
link: https://bsky.app/profile/$VALUE

facebook:
icon: fa-brands fa-facebook
text: Facebook
Expand Down
2 changes: 1 addition & 1 deletion _includes/content.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{% if dark == "true" or dark == "false" %}
data-dark="{{ dark }}"
{% endif %}
{% if background %}
{% if image %}
style="--image: url('{{ image | relative_url | uri_escape }}')"
{% endif %}
>
Expand Down
2 changes: 1 addition & 1 deletion _includes/fonts.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link href="{{ googlefonts }}" rel="stylesheet">

<!-- Font Awesome icons (load asynchronously due to size) -->
{% assign fontawesome = "https://use.fontawesome.com/releases/v6.5.0/css/all.css" %}
{% assign fontawesome = "https://use.fontawesome.com/releases/v6.7.0/css/all.css" %}
<link
href="{{ fontawesome }}"
rel="stylesheet"
Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% assign image = page.footer | default: site.footer | relative_url %}
{% assign image = page.footer | default: site.footer %}
{% assign dark = page.footer-dark | is_nil: site.footer-dark | is_nil: true %}

<footer
Expand Down
2 changes: 1 addition & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% assign image = page.header | default: site.header | relative_url %}
{% assign image = page.header | default: site.header %}
{% assign dark = page.header-dark | is_nil: site.header-dark | is_nil: true %}

{% assign svg = "images/logo.svg" | file_exists %}
Expand Down
18 changes: 11 additions & 7 deletions _includes/meta.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
{% assign title = nil %}
{% endif %}

{% assign title = title | xml_escape %}

{% assign fulltitle = "" | split: "," %}
{% if title %}
{% assign fulltitle = fulltitle | push: title %}
Expand All @@ -28,6 +30,8 @@
{{ site.url }}{{ site.baseurl }}
{%- endcapture %}

{% assign description = description | xml_escape %}

{% assign png = "images/icon.png" | file_exists %}
{% assign jpg = "images/icon.jpg" | file_exists %}
{% assign icon = png | default: jpg | relative_url %}
Expand All @@ -47,24 +51,24 @@

<link rel="icon" href="{{ icon }}">

<meta name="title" content="{{ title | xml_escape }}">
<meta name="description" content="{{ description | xml_escape }}">
<meta name="title" content="{{ title }}">
<meta name="description" content="{{ description }}">

<meta property="og:title" content="{{ title | xml_escape }}">
<meta property="og:title" content="{{ title }}">
<meta property="og:site_title" content="{{ site.title | xml_escape }}">
<meta property="og:description" content="{{ description | xml_escape }}">
<meta property="og:description" content="{{ description }}">
<meta property="og:url" content="{{ url }}">
<meta property="og:image" content="{{ share }}">
<meta property="og:locale" content="en_US">

<meta property="twitter:title" content="{{ title | xml_escape }}">
<meta property="twitter:description" content="{{ description | xml_escape }}">
<meta property="twitter:title" content="{{ title }}">
<meta property="twitter:description" content="{{ description }}">
<meta property="twitter:url" content="{{ url }}">
<meta property="twitter:card" content="summary_large_image">
<meta property="twitter:image" content="{{ share }}">

{% if page.author %}
<meta name="author" content="{{ page | xml_escape.author }}">
<meta name="author" content="{{ page.author | xml_escape }}">
<meta property="og:type" content="article">
<meta property="og:updated_time" content="{{ updated }}">
<meta property="article:published_time" content="{{ published }}">
Expand Down
10 changes: 5 additions & 5 deletions _includes/post-excerpt.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@

<div class="post-excerpt-container">
<div class="post-excerpt">
{% assign url = post.url %}
{% assign url = post.url | relative_url | uri_escape %}
{% assign title = post.title %}
{% assign image = post.image %}
{% assign image = post.image | relative_url | uri_escape %}

{% if image %}
<a
href="{{ url | relative_url | uri_escape }}"
href="{{ url }}"
class="post-excerpt-image"
aria-label="{{ title | default: "excerpt link" | regex_strip }}"
>
<img
src="{{ image | relative_url | uri_escape }}"
src="{{ image }}"
alt="{{ title | default: "excerpt image" | regex_strip }}"
loading="lazy"
{% include fallback.html %}
Expand All @@ -30,7 +30,7 @@
{% endif %}

<div class="post-excerpt-text">
<a href="{{ url | relative_url | uri_escape }}">{{ title }}</a>
<a href="{{ url }}">{{ title }}</a>

{%
include post-info.html
Expand Down
2 changes: 1 addition & 1 deletion _members/jane-smith.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Jane Smith
image: images/photo.jpg
role: pi
role: principal-investigator
affiliation: University of Colorado
aliases:
- J. Smith
Expand Down
Loading