Skip to content

Fix several typos and bugs #2799

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

Merged
merged 5 commits into from
Feb 1, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Academic Pages
**Academic Pages is a Github Pages template for academic websites.**
**Academic Pages is a GitHub Pages template for academic websites.**

![Academic Pages template example](images/homepage.png "Academic Pages template example")

Expand Down
2 changes: 1 addition & 1 deletion _includes/archive-single-cv.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h3 class="archive__item-title" itemprop="headline">
{% endif %}
</h3>
{% if post.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}
{% if post.venue%}<p class="archive__item-excerpt" itemprop="description">{{ post.citation }}</p> {% endif %}
</li>
Expand Down
2 changes: 1 addition & 1 deletion _includes/archive-single-talk-cv.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h3 class="archive__item-title" itemprop="headline">
<a href="{{ base_path }}{{ post.url }}" rel="permalink">{{ title }}</a>
{% endif %}
</h3>
{% if post.date %}<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {{ post.date | date: '%B %d, %Y' }}</p>{% endif %}
{% if post.date %}<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {{ post.date | date: '%B %d, %Y' }}</p>{% endif %}
{% if post.venue%}<p class="archive__item-excerpt" itemprop="description">{{post.type}} at {{ post.venue }}, {{post.location}}</p>{% endif %}
</li>
</article>
Expand Down
4 changes: 2 additions & 2 deletions _includes/archive-single-talk.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ <h2 class="archive__item-title" itemprop="headline">
{% endif %}
</h2>
{% if post.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}
{% if post.date %}<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {{ post.date | date: '%B %d, %Y' }}</p>{% endif %}
{% if post.date %}<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {{ post.date | date: '%B %d, %Y' }}</p>{% endif %}
{% if post.venue %}<p class="archive__item-excerpt" itemprop="description">{{post.type}}, {{ post.venue }}, {{post.location}} {% endif %}
{% if post.excerpt %}<p class="archive__item-excerpt" itemprop="description">{{ post.excerpt | markdownify }}</p>{% endif %}
</article>
Expand Down
2 changes: 1 addition & 1 deletion _includes/archive-single.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h2 class="archive__item-title" itemprop="headline">
</h2>

{% if post.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}

{% if post.collection == 'teaching' %}
Expand Down
2 changes: 1 addition & 1 deletion _includes/author-profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h3 class="author__name">{{ author.name }}</h3>
<li><a href="https://dribbble.com/{{ author.dribbble }}"><i class="fab fa-fw fa-dribbble icon-pad-right" aria-hidden="true"></i>Dribbble</a></li>
{% endif %}
{% if author.github %}
<li><a href="https://github.com/{{ author.github }}"><i class="fab fa-fw fa-github icon-pad-right" aria-hidden="true"></i>Github</a></li>
<li><a href="https://github.com/{{ author.github }}"><i class="fab fa-fw fa-github icon-pad-right" aria-hidden="true"></i>GitHub</a></li>
{% endif %}
{% if author.kaggle %}
<li><a href="https://kaggle.com/{{ author.kaggle }}"><i class="fab fa-fw fa-kaggle icon-pad-right" aria-hidden="true"></i>Kaggle</a></li>
Expand Down
2 changes: 1 addition & 1 deletion _includes/page__hero.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h1 class="page__title" itemprop="headline">
<p class="page__lead">{{ page.excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
{% endif %}
{% if site.read_time and page.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}
{% if page.header.cta_url %}
<p><a href="{{ cta_path }}" class="btn btn--light-outline btn--large">{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<header>
{% if page.title %}<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
{% if page.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}
{% if page.modified %}
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Published:" }}</strong> <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time></p>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/talk.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<header>
{% if page.title %}<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
{% if page.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
<p class="page__meta"><i class="fa fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}
{% if page.modified %}
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i>Date:</strong> <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time></p>
Expand Down
2 changes: 1 addition & 1 deletion _pages/archive-layout-with-content.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Make any link standout more when applying the `.btn` class.

### Anchor Tag (aka. Link)

This is an example of a [link](http://github.com "Github").
This is an example of a [link](http://github.com "GitHub").

### Abbreviation Tag

Expand Down
6 changes: 3 additions & 3 deletions _pages/cv.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ Education
Work experience
======
* Spring 2024: Academic Pages Collaborator
* Github University
* GitHub University
* Duties includes: Updates and improvements to template
* Supervisor: The Users

* Fall 2015: Research Assistant
* Github University
* GitHub University
* Duties included: Merging pull requests
* Supervisor: Professor Hub

* Summer 2015: Research Assistant
* Github University
* GitHub University
* Duties included: Tagging issues
* Supervisor: Professor Git

Expand Down
4 changes: 2 additions & 2 deletions _pages/markdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ redirect_from:
## Tips and hints

* Name a file ".md" to have it render in markdown, name it ".html" to render in HTML.
* Go to the [commit list](https://github.com/academicpages/academicpages.github.io/commits/master) (on your repo) to find the last version Github built with Jekyll.
* Go to the [commit list](https://github.com/academicpages/academicpages.github.io/commits/master) (on your repo) to find the last version GitHub built with Jekyll.
* Green check: successful build
* Orange circle: building
* Red X: error
Expand Down Expand Up @@ -182,7 +182,7 @@ This is the regular text.[^1] This is more regular text.[^note]

### Anchor Tag (aka. Link)

This is an example of a [link](http://github.com "Github").
This is an example of a [link](http://github.com "GitHub").

### Abbreviation Tag

Expand Down
2 changes: 1 addition & 1 deletion _pages/talkmap.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
author_profile: true
---

<p>This map is generated from a Jupyter Notebook file in <a href="https://github.com/academicpages/academicpages.github.io/blob/master/_talks/talkmap.ipynb">/_talks/talkmap.ipynb</a>, which mines the location fields in the .md files in _talks/.</p>
<p>This map is generated from a Jupyter Notebook file in <a href="https://github.com/academicpages/academicpages.github.io/blob/master/talkmap.ipynb">talkmap.ipynb</a>, which mines the location fields in the .md files in _talks/.</p>
<iframe src="/talkmap/map.html" height="700" width="850" style="border:none;"></iframe>
6 changes: 3 additions & 3 deletions _sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ $x-large : 1280px !default;
Grid
========================================================================== */

$right-sidebar-width-narrow : 200px !default;
$right-sidebar-width : 300px !default;
$right-sidebar-width-wide : 400px !default;
$right-sidebar-width-narrow : 20px !default;
$right-sidebar-width : 30px !default;
$right-sidebar-width-wide : 40px !default;

$susy: (
columns: 12,
Expand Down
2 changes: 1 addition & 1 deletion assets/js/main.min.js

Large diffs are not rendered by default.

35 changes: 19 additions & 16 deletions assets/js/plugins/jquery.greedy-navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,27 @@ function updateNav() {
// The visible list is overflowing the nav
if($vlinks.width() > availableSpace) {

// Record the width of the list
breaks.push($vlinks.width());
while ($vlinks.width() > availableSpace && $vlinks.children('*:not(.masthead__menu-item--lg)').length > 0) {

// Move item to the hidden list
$vlinks.children('*:not(.masthead__menu-item--lg)').last().prependTo($hlinks);
// Record the width of the list
breaks.push($vlinks.width());

// Show the dropdown btn
if($btn.hasClass('hidden')) {
$btn.removeClass('hidden');
// Move item to the hidden list
$vlinks.children('*:not(.masthead__menu-item--lg)').last().prependTo($hlinks);

availableSpace = $btn.hasClass('hidden') ? $nav.width() : $nav.width() - $btn.width() - 30;

// Show the dropdown btn
if($btn.hasClass('hidden')) {
$btn.removeClass('hidden');
}
}

// The visible list is not overflowing
// The visible list is not overflowing
} else {

// There is space for another item in the nav
if(availableSpace > breaks[breaks.length-1]) {

while(breaks.length > 0 && availableSpace > breaks[breaks.length-1]) {
// Move the item to the visible list
$hlinks.children().first().appendTo($vlinks);
breaks.pop();
Expand All @@ -44,23 +48,22 @@ function updateNav() {
// Hide the dropdown btn if hidden list is empty
if(breaks.length < 1) {
$btn.addClass('hidden');
$btn.removeClass('close');
$hlinks.addClass('hidden');
}
}

// Keep counter updated
$btn.attr("count", breaks.length);

// Recur if the visible list is still overflowing the nav
if($vlinks.width() > availableSpace) {
updateNav();
}

}

// Window listeners

$(window).resize(function() {
$(window).on('resize', function() {
updateNav();
});
screen.orientation.addEventListener("change", function(){
updateNav();
});

Expand Down