Skip to content

Commit edc854a

Browse files
alshedivatalshedivat
committed
First step toward moving to Bootstrap.
1 parent dc14524 commit edc854a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+716
-5161
lines changed

‎_config.yml

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# -----------------------------------------------------------------------------
22
# Site settings
33
# -----------------------------------------------------------------------------
4-
name: Your Name
4+
5+
title: Your Name
56
email: you@example.com
67
description: > # this means to ignore newlines until "url:"
78
A simple, whitespace theme for academics. Based on [*folio](https://github.com/bogoli/-folio) design.
@@ -12,11 +13,21 @@ footer_text: >
1213
1314
url: # the base hostname & protocol for your site
1415
baseurl: /al-folio # the subpath of your site, e.g. /blog/
15-
last_updated: # leave blank if you don't want to display last updated
16+
last_updated: false # set to true if you want to display last updated in the footer
17+
18+
# -----------------------------------------------------------------------------
19+
# Layout
20+
# -----------------------------------------------------------------------------
21+
22+
navbar_fixed: true
23+
footer_fixed: false
24+
social_icons_pos: bottom
25+
# TODO: add layout settings (single page vs. multi-page)
1626

1727
# -----------------------------------------------------------------------------
1828
# Social integration
1929
# -----------------------------------------------------------------------------
30+
2031
github_username: # your GitHub user name
2132
twitter_username: # your Twitter handle
2233
linkedin_username: # your LinkedIn user name
@@ -30,6 +41,7 @@ google_analytics: UA-XXXXXXXXX # out your google-analytics code
3041
# -----------------------------------------------------------------------------
3142
# Blog
3243
# -----------------------------------------------------------------------------
44+
3345
blog_name: al-folio
3446
blog_description: a simple whitespace theme for academics
3547

@@ -46,14 +58,10 @@ text:
4658
# Comments
4759
disqus_shortname: al-folio # put your disqus shortname
4860

49-
# Optional features
50-
show_social_icons: false
51-
enable_anchorjs: false
52-
enable_katex: true
53-
5461
# -----------------------------------------------------------------------------
5562
# Collections
5663
# -----------------------------------------------------------------------------
64+
5765
collections:
5866
news:
5967
defaults:
@@ -85,7 +93,10 @@ plugins:
8593
- jekyll/scholar
8694
- jemoji
8795

88-
# Jekyll-Scholar
96+
# -----------------------------------------------------------------------------
97+
# Jekyll Scholar
98+
# -----------------------------------------------------------------------------
99+
89100
scholar:
90101

91102
last_name: Einstein
@@ -110,8 +121,26 @@ scholar:
110121
query: "@*"
111122

112123
# -----------------------------------------------------------------------------
113-
# Other settings
124+
# Optional Features
125+
# -----------------------------------------------------------------------------
126+
127+
enable_google_analytics: false
128+
enable_highlight: true
129+
enable_katex: true
130+
enable_mansory: false
131+
enable_progressbar: false
132+
enable_tooltips: false
133+
show_social_icons: true
134+
135+
# -----------------------------------------------------------------------------
136+
# Library versions
114137
# -----------------------------------------------------------------------------
115-
jquery_version: "1.12.4"
116-
katex_version: "0.9.0"
117-
anchorjs_version: "3.2.2"
138+
139+
academicons_version: "1.8.6"
140+
bootstrap_version: "4.4.1"
141+
fontawesome_version: "5.11.2"
142+
highlight_version: "9.15.10"
143+
jquery_version: "3.4.1"
144+
katex_version: "0.11.1"
145+
mdb_version: "4.8.10"
146+
popper_version: "1.15.0"

‎_includes/footer.html

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
<footer>
2-
3-
<div class="wrapper">
4-
&copy; Copyright {{ site.time | date: '%Y' }} {{ site.name }}.
1+
{% if site.footer_fixed %}
2+
<footer class="fixed-bottom">
3+
<div class="container mt-0">
4+
&copy; Copyright {{ site.time | date: '%Y' }} {{ site.title }}.
55
{{ site.footer_text }}
66
{% if site.last_updated %}
7-
Last updated: {{ site.last_updated }}.
7+
Last updated: {{ "now" | date: '%B %d, %Y' }}.
88
{% endif %}
99
</div>
10-
1110
</footer>
11+
{% else %}
12+
<footer class="sticky-bottom mt-5">
13+
<div class="container">
14+
&copy; Copyright {{ site.time | date: '%Y' }} {{ site.title }}.
15+
{{ site.footer_text }}
16+
{% if site.last_updated %}
17+
Last updated: {{ "now" | date: '%B %d, %Y' }}.
18+
{% endif %}
19+
</div>
20+
</footer>
21+
{% endif %}

‎_includes/head.html

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
<head>
2-
<meta charset="utf-8">
3-
<meta name="viewport" content="width=device-width initial-scale=1" />
4-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1+
<meta charset="utf-8">
2+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
3+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
54

6-
<title>{{ site.name }}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title>
7-
<meta name="description" content="{{ site.description }}">
5+
<title>{{ site.title }}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title>
6+
<meta name="description" content="{{ site.description }}">
87

9-
<link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl | prepend: site.url }}">
8+
<!-- Bootstrap & MDB -->
9+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb_version }}/css/mdb.min.css">
1011

11-
<link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl | prepend: site.url }}">
12-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
13-
</head>
12+
<!-- Fonts & Icons -->
13+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/{{ site.fontawesome_version }}/css/all.min.css">
14+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/{{ site.academicons_version }}/css/academicons.min.css">
15+
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:100,300,400,500,700|Material+Icons">
16+
17+
<!-- Styles -->
18+
<link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl | prepend: site.url }}">
19+
<link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl | prepend: site.url }}">
20+
21+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">

‎_includes/header.html

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,58 @@
1-
<header class="site-header">
2-
3-
<div class="wrapper">
4-
5-
{% if page.layout != "about" %}
6-
<span class="site-title">
7-
{% assign name = site.name | split: ' ' %}
8-
<strong>{{ name | first }}</strong> {{ name | last }}
9-
</span>
10-
{% endif %}
11-
12-
<nav class="site-nav">
13-
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
14-
<label for="nav-trigger">
15-
<span class="menu-icon">
16-
<svg viewBox="0 0 18 15" width="18px" height="15px">
17-
<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
18-
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
19-
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
20-
</svg>
21-
</span>
22-
</label>
23-
24-
<div class="trigger">
25-
<!-- About -->
26-
<a class="page-link" href="{{ site.baseurl | prepend: site.url }}/">about</a>
27-
28-
<!-- Blog -->
29-
<a class="page-link" href="{{ '/blog/' | prepend: site.baseurl | prepend: site.url }}">blog</a>
30-
31-
<!-- Pages -->
32-
{% for page in site.pages %}
33-
{% if page.title and page.url != "/" %}
34-
<a class="page-link" href="{{ page.url | prepend: site.baseurl | prepend: site.url }}">{{ page.title }}</a>
35-
{% endif %}
36-
{% endfor %}
37-
38-
<!-- CV link -->
39-
<!-- <a class="page-link" href="{{ '/assets/pdf/CV.pdf' | prepend: site.baseurl | prepend: site.url }}">vitae</a> -->
40-
1+
<header>
2+
3+
<!-- Nav Bar -->
4+
<nav id="navbar" class="navbar navbar-light bg-white navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
5+
<div class="container">
6+
{% if page.title != "about" %}
7+
{% assign name = site.title | split: ' ' %}
8+
<a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl | prepend: site.url }}/"><span class="font-weight-bold">{{ name | first }}</span> {{ name | last }}</a>
9+
{% elsif site.social_icons_pos == 'top' %}
10+
<!-- Social Icons -->
11+
<div class="row ml-1 ml-sm-0">
12+
{% include social.html %}
13+
</div>
14+
{% endif %}
15+
<!-- Navbar Toogle -->
16+
<button class="navbar-toggler collapsed ml-auto" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
17+
<span class="sr-only">Toggle navigation</span>
18+
<span class="icon-bar top-bar"></span>
19+
<span class="icon-bar middle-bar"></span>
20+
<span class="icon-bar bottom-bar"></span>
21+
</button>
22+
<div class="collapse navbar-collapse text-right" id="navbarNav">
23+
<ul class="navbar-nav ml-auto flex-nowrap">
24+
<li class="nav-item {% if page.title == 'about' %}navbar-active{% endif %}">
25+
<a class="nav-link" href="{{ '/' | prepend: site.baseurl | prepend: site.url }}">
26+
about
27+
{% if page.title == "about" %}
28+
<span class="sr-only">(current)</span>
29+
{% endif %}
30+
</a>
31+
</li>
32+
{% for p in site.pages %}
33+
{% if p.title and p.url != "/" %}
34+
<li class="nav-item {% if page.nav == p.nav %}navbar-active{% endif %}">
35+
<a class="nav-link" href="{{ p.url | prepend: site.baseurl | prepend: site.url }}">
36+
{{ p.title }}
37+
{% if page.nav == p.nav %}
38+
<span class="sr-only">(current)</span>
39+
{% endif %}
40+
</a>
41+
</li>
42+
{% endif %}
43+
{% endfor %}
44+
</ul>
4145
</div>
42-
</nav>
43-
44-
</div>
46+
</div>
47+
</nav>
48+
49+
{% if site.enable_progressbar %}
50+
<!-- Scrolling Progress Bar -->
51+
<progress id="progress" value="0">
52+
<div class="progress-container">
53+
<span class="progress-bar"></span>
54+
</div>
55+
</progress>
56+
{% endif %}
4557

4658
</header>

‎_includes/hemline.html

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,46 @@
1-
<!-- Load jQuery -->
2-
<script src="//code.jquery.com/jquery-{{ site.jquery_version }}.min.js"></script>
1+
<!-- Load Core and Bootstrap JS -->
2+
<script src="https://code.jquery.com/jquery-{{ site.jquery_version }}.slim.min.js"></script>
3+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/{{ site.popper_version }}/umd/popper.min.js"></script>
4+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/js/bootstrap.min.js"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb_version }}/js/mdb.min.js"></script>
36

47
<!-- Load Common JS -->
58
<script src="{{ '/assets/js/common.js' | prepend: site.baseurl | prepend: site.url }}"></script>
69

10+
<!-- Code Syntax Highlighting -->
11+
{% if site.enable_highlight %}
12+
<link href="https://fonts.googleapis.com/css?family=Source+Code+Pro" rel="stylesheet">
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/{{ site.highlight_version }}/highlight.min.js" integrity="sha256-1zu+3BnLYV9LdiY85uXMzii3bdrkelyp37e0ZyTAQh0=" crossorigin="anonymous"></script>
14+
<script>hljs.initHighlightingOnLoad();</script>
15+
{% endif %}
16+
717
{% if site.enable_katex %}
818
<!-- Load KaTeX -->
9-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex_version }}/katex.min.css">
10-
<script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex_version }}/katex.min.js"></script>
19+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex_version }}/katex.min.css" integrity="sha256-V8SV2MO1FUb63Bwht5Wx9x6PVHNa02gv8BgH/uH3ung=" crossorigin="anonymous" />
20+
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex_version }}/katex.min.js" integrity="sha256-F/Xda58SPdcUCr+xhSGz9MA2zQBPb0ASEYKohl8UCHc=" crossorigin="anonymous"></script>
1121
<script src="{{ '/assets/js/katex.js' | prepend: site.baseurl | prepend: site.url }}"></script>
1222
{% endif %}
1323

14-
{% if site.enable_anchorjs %}
15-
<!-- Load Anchor JS -->
16-
<script src="//cdnjs.cloudflare.com/ajax/libs/anchor-js/{{ site.anchorjs_version }}/anchor.min.js"></script>
17-
<script>
18-
anchors.options.visible = 'always';
19-
anchors.add('article h2, article h3, article h4, article h5, article h6');
20-
</script>
24+
{% if site.enable_mansory %}
25+
<!-- Load Mansory -->
26+
<script src="https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js" integrity="sha256-Nn1q/fx0H7SNLZMQ5Hw5JLaTRZp0yILA/FRexe19VdI=" crossorigin="anonymous"></script>
2127
{% endif %}
2228

23-
<!-- Include custom icon fonts -->
24-
<link rel="stylesheet" href="{{ '/assets/css/fontawesome-all.min.css' | prepend: site.baseurl | prepend: site.url }}">
25-
<link rel="stylesheet" href="{{ '/assets/css/academicons.min.css' | prepend: site.baseurl | prepend: site.url }}">
29+
{% if site.enable_progressbar %}
30+
<!-- Load Progress Bar -->
31+
<script src="{{ '/assets/js/progressbar.js' | prepend: site.baseurl | prepend: site.url }}"></script>
32+
{% endif %}
2633

34+
{% if site.enable_tooltips %}
35+
<!-- Enable Tooltips -->
36+
<script type="text/javascript">
37+
$(function () {
38+
$('[data-toggle="tooltip"]').tooltip()
39+
})
40+
</script>
41+
{% endif %}
42+
43+
{% if site.enable_google_analytics %}
2744
<!-- Google Analytics -->
2845
<script>
2946
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -34,3 +51,4 @@
3451
ga('create', '{{ site.google_analytics }}', 'auto');
3552
ga('send', 'pageview');
3653
</script>
54+
{% endif %}

‎_includes/news.html

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<div class="news">
22
<h2>news</h2>
33
{% if site.news %}
4-
<table>
5-
{% assign news = site.news | reverse %}
6-
{% for item in news limit: site.news_limit %}
7-
<tr>
8-
<td class="date">{{ item.date | date: "%b %-d, %Y" }}</td>
9-
<td class="announcement">
10-
{% if item.inline %}
11-
{{ item.content | remove: '<p>' | remove: '</p>' | emojify }}
12-
{% else %}
13-
<a class="news-title" href="{{ item.url | prepend: site.baseurl }}">{{ item.title }}</a>
14-
{% endif %}
15-
</td>
16-
</tr>
17-
{% endfor %}
18-
</table>
4+
<div class="table-responsive">
5+
<table class="table table-sm table-borderless">
6+
{% assign news = site.news | reverse %}
7+
{% for item in news limit: site.news_limit %}
8+
<tr>
9+
<th scope="row">{{ item.date | date: "%b %-d, %Y" }}</th>
10+
<td>
11+
{% if item.inline %}
12+
{{ item.content | remove: '<p>' | remove: '</p>' | emojify }}
13+
{% else %}
14+
<a class="news-title" href="{{ item.url | prepend: site.baseurl }}">{{ item.title }}</a>
15+
{% endif %}
16+
</td>
17+
</tr>
18+
{% endfor %}
19+
</table>
20+
</div>
1921
{% else %}
2022
<p>No news so far...</p>
2123
{% endif %}

‎_includes/social.html

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
<div class="social">
2-
<span class="contacticon center">
3-
<a href="mailto:{{ site.email | encode_email }}"><i class="fas fa-envelope"></i></a>
4-
{% if site.orcid_id %}<a href="https://orcid.org/{{ site.orcid_id }}" target="_blank" title="ORCID"><i class="ai ai-orcid"></i></a>{% endif %}
5-
{% if site.scholar_userid %}<a href="https://scholar.google.com/citations?user={{ site.scholar_userid }}" target="_blank" title="Google Scholar"><i class="ai ai-google-scholar"></i></a>{% endif %}
6-
{% if site.github_username %}<a href="https://github.com/{{ site.github_username }}" target="_blank" title="GitHub"><i class="fab fa-github"></i></a>{% endif %}
7-
{% if site.linkedin_username %}<a href="https://www.linkedin.com/in/{{ site.linkedin_username }}" target="_blank" title="LinkedIn"><i class="fab fa-linkedin"></i></a>{% endif %}
8-
{% if site.twitter_username %}<a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" title="Twitter"><i class="fab fa-twitter"></i></a>{% endif %}
9-
{% if site.strava_userid %}<a href="https://www.strava.com/athletes/{{ site.strava_userid }}" target="_blank" title="Strava"><i class="fab fa-strava"></i></a>{% endif %}
10-
</span>
11-
12-
<div class="col three caption">
13-
{{ site.contact_note }}
14-
</div>
15-
</div>
1+
<span class="contact-icon text-center">
2+
<a href="mailto:{{ site.email | encode_email }}"><i class="fas fa-envelope"></i></a>
3+
{% if site.orcid_id %}<a href="https://orcid.org/{{ site.orcid_id }}" target="_blank" title="ORCID"><i class="ai ai-orcid"></i></a>{% endif %}
4+
{% if site.scholar_userid %}<a href="https://scholar.google.com/citations?user={{ site.scholar_userid }}" target="_blank" title="Google Scholar"><i class="ai ai-google-scholar"></i></a>{% endif %}
5+
{% if site.github_username %}<a href="https://github.com/{{ site.github_username }}" target="_blank" title="GitHub"><i class="fab fa-github"></i></a>{% endif %}
6+
{% if site.linkedin_username %}<a href="https://www.linkedin.com/in/{{ site.linkedin_username }}" target="_blank" title="LinkedIn"><i class="fab fa-linkedin"></i></a>{% endif %}
7+
{% if site.twitter_username %}<a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" title="Twitter"><i class="fab fa-twitter"></i></a>{% endif %}
8+
{% if site.strava_userid %}<a href="https://www.strava.com/athletes/{{ site.strava_userid }}" target="_blank" title="Strava"><i class="fab fa-strava"></i></a>{% endif %}
9+
</span>

0 commit comments

Comments
 (0)