Skip to content

Commit

Permalink
Merge branch 'master' into pin_posts
Browse files Browse the repository at this point in the history
  • Loading branch information
george-gca authored Jun 25, 2023
2 parents 16f3b98 + 1a612c6 commit 35d03dd
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- name: Install and Build 🔧
run: |
npm install -g mermaid.cli
export JEKYLL_ENV=production
bundle exec jekyll build
- name: Deploy 🚀
if: github.event_name != 'pull_request'
Expand Down
3 changes: 3 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ jekyll-archives:
category: '/blog/category/:name/'

display_tags: ['formatting', 'images', 'links', 'math', 'code'] # these tags will be displayed on the front page of your blog
display_categories: ['blockquotes'] # these categories will be displayed on the front page of your blog

# -----------------------------------------------------------------------------
# Jekyll Scholar
Expand Down Expand Up @@ -292,6 +293,8 @@ scholar:
details_link: Details

query: "@*"
group_by: year
group_order: descending

badges: # Display different badges for your publications
altmetric_badge: true # Altmetric badge (https://www.altmetric.com/products/altmetric-badges/)
Expand Down
6 changes: 1 addition & 5 deletions _pages/publications.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ layout: page
permalink: /publications/
title: publications
description: publications by categories in reversed chronological order. generated by jekyll-scholar.
years: [1967, 1956, 1950, 1935, 1905]
nav: true
nav_order: 1
---
<!-- _pages/publications.md -->
<div class="publications">

{%- for y in page.years %}
<h2 class="year">{{y}}</h2>
{% bibliography -f {{ site.scholar.bibliography }} -q @*[year={{y}}]* %}
{% endfor %}
{% bibliography -f {{ site.scholar.bibliography }} %}

</div>
4 changes: 2 additions & 2 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ footer.sticky-bottom {
}
}

.tag-list {
.tag-category-list {
border-bottom: 1px solid var(--global-divider-color);
text-align: center;
padding-top: 1rem;
Expand Down Expand Up @@ -567,7 +567,7 @@ footer.sticky-bottom {
}
}

h2.year {
h2.bibliography {
color: var(--global-divider-color);
border-top: 1px solid var(--global-divider-color);
padding-top: 1rem;
Expand Down
15 changes: 13 additions & 2 deletions blog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ <h2>{{ site.blog_description }}</h2>
</div>
{% endif %}

{% if site.display_tags %}
<div class="tag-list">
{% if site.display_tags or site.display_categories %}
<div class="tag-category-list">
<ul class="p-0 m-0">
{% for tag in site.display_tags %}
<li>
Expand All @@ -36,6 +36,17 @@ <h2>{{ site.blog_description }}</h2>
<p>&bull;</p>
{% endunless %}
{% endfor %}
{% if site.display_categories.size > 0 and site.display_tags.size > 0 %}
<p>&bull;</p>
{% endif %}
{% for category in site.display_categories %}
<li>
<i class="fas fa-tag fa-sm"></i> <a href="{{ category | slugify | prepend: '/blog/category/' | relative_url }}">{{ category }}</a>
</li>
{% unless forloop.last %}
<p>&bull;</p>
{% endunless %}
{% endfor %}
</ul>
</div>
{% endif %}
Expand Down

0 comments on commit 35d03dd

Please sign in to comment.