forked from alshedivat/al-folio
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
First step toward moving to Bootstrap.
- Loading branch information
1 parent
dc14524
commit edc854a
Showing
74 changed files
with
716 additions
and
5,161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,21 @@ | ||
| <footer> | ||
|
|
||
| <div class="wrapper"> | ||
| © Copyright {{ site.time | date: '%Y' }} {{ site.name }}. | ||
| {% if site.footer_fixed %} | ||
| <footer class="fixed-bottom"> | ||
| <div class="container mt-0"> | ||
| © Copyright {{ site.time | date: '%Y' }} {{ site.title }}. | ||
| {{ site.footer_text }} | ||
| {% if site.last_updated %} | ||
| Last updated: {{ site.last_updated }}. | ||
| Last updated: {{ "now" | date: '%B %d, %Y' }}. | ||
| {% endif %} | ||
| </div> | ||
|
|
||
| </footer> | ||
| {% else %} | ||
| <footer class="sticky-bottom mt-5"> | ||
| <div class="container"> | ||
| © Copyright {{ site.time | date: '%Y' }} {{ site.title }}. | ||
| {{ site.footer_text }} | ||
| {% if site.last_updated %} | ||
| Last updated: {{ "now" | date: '%B %d, %Y' }}. | ||
| {% endif %} | ||
| </div> | ||
| </footer> | ||
| {% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,21 @@ | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width initial-scale=1" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
|
|
||
| <title>{{ site.name }}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title> | ||
| <meta name="description" content="{{ site.description }}"> | ||
| <title>{{ site.title }}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title> | ||
| <meta name="description" content="{{ site.description }}"> | ||
|
|
||
| <link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl | prepend: site.url }}"> | ||
| <!-- Bootstrap & MDB --> | ||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/css/bootstrap.min.css"> | ||
| <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb_version }}/css/mdb.min.css"> | ||
|
|
||
| <link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl | prepend: site.url }}"> | ||
| <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}"> | ||
| </head> | ||
| <!-- Fonts & Icons --> | ||
| <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/{{ site.fontawesome_version }}/css/all.min.css"> | ||
| <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/{{ site.academicons_version }}/css/academicons.min.css"> | ||
| <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"> | ||
|
|
||
| <!-- Styles --> | ||
| <link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl | prepend: site.url }}"> | ||
| <link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl | prepend: site.url }}"> | ||
|
|
||
| <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}"> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,58 @@ | ||
| <header class="site-header"> | ||
|
|
||
| <div class="wrapper"> | ||
|
|
||
| {% if page.layout != "about" %} | ||
| <span class="site-title"> | ||
| {% assign name = site.name | split: ' ' %} | ||
| <strong>{{ name | first }}</strong> {{ name | last }} | ||
| </span> | ||
| {% endif %} | ||
|
|
||
| <nav class="site-nav"> | ||
| <input type="checkbox" id="nav-trigger" class="nav-trigger" /> | ||
| <label for="nav-trigger"> | ||
| <span class="menu-icon"> | ||
| <svg viewBox="0 0 18 15" width="18px" height="15px"> | ||
| <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"/> | ||
| <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"/> | ||
| <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"/> | ||
| </svg> | ||
| </span> | ||
| </label> | ||
|
|
||
| <div class="trigger"> | ||
| <!-- About --> | ||
| <a class="page-link" href="{{ site.baseurl | prepend: site.url }}/">about</a> | ||
|
|
||
| <!-- Blog --> | ||
| <a class="page-link" href="{{ '/blog/' | prepend: site.baseurl | prepend: site.url }}">blog</a> | ||
|
|
||
| <!-- Pages --> | ||
| {% for page in site.pages %} | ||
| {% if page.title and page.url != "/" %} | ||
| <a class="page-link" href="{{ page.url | prepend: site.baseurl | prepend: site.url }}">{{ page.title }}</a> | ||
| {% endif %} | ||
| {% endfor %} | ||
|
|
||
| <!-- CV link --> | ||
| <!-- <a class="page-link" href="{{ '/assets/pdf/CV.pdf' | prepend: site.baseurl | prepend: site.url }}">vitae</a> --> | ||
|
|
||
| <header> | ||
|
|
||
| <!-- Nav Bar --> | ||
| <nav id="navbar" class="navbar navbar-light bg-white navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}"> | ||
| <div class="container"> | ||
| {% if page.title != "about" %} | ||
| {% assign name = site.title | split: ' ' %} | ||
| <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> | ||
| {% elsif site.social_icons_pos == 'top' %} | ||
| <!-- Social Icons --> | ||
| <div class="row ml-1 ml-sm-0"> | ||
| {% include social.html %} | ||
| </div> | ||
| {% endif %} | ||
| <!-- Navbar Toogle --> | ||
| <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"> | ||
| <span class="sr-only">Toggle navigation</span> | ||
| <span class="icon-bar top-bar"></span> | ||
| <span class="icon-bar middle-bar"></span> | ||
| <span class="icon-bar bottom-bar"></span> | ||
| </button> | ||
| <div class="collapse navbar-collapse text-right" id="navbarNav"> | ||
| <ul class="navbar-nav ml-auto flex-nowrap"> | ||
| <li class="nav-item {% if page.title == 'about' %}navbar-active{% endif %}"> | ||
| <a class="nav-link" href="{{ '/' | prepend: site.baseurl | prepend: site.url }}"> | ||
| about | ||
| {% if page.title == "about" %} | ||
| <span class="sr-only">(current)</span> | ||
| {% endif %} | ||
| </a> | ||
| </li> | ||
| {% for p in site.pages %} | ||
| {% if p.title and p.url != "/" %} | ||
| <li class="nav-item {% if page.nav == p.nav %}navbar-active{% endif %}"> | ||
| <a class="nav-link" href="{{ p.url | prepend: site.baseurl | prepend: site.url }}"> | ||
| {{ p.title }} | ||
| {% if page.nav == p.nav %} | ||
| <span class="sr-only">(current)</span> | ||
| {% endif %} | ||
| </a> | ||
| </li> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </ul> | ||
| </div> | ||
| </nav> | ||
|
|
||
| </div> | ||
| </div> | ||
| </nav> | ||
|
|
||
| {% if site.enable_progressbar %} | ||
| <!-- Scrolling Progress Bar --> | ||
| <progress id="progress" value="0"> | ||
| <div class="progress-container"> | ||
| <span class="progress-bar"></span> | ||
| </div> | ||
| </progress> | ||
| {% endif %} | ||
|
|
||
| </header> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,9 @@ | ||
| <div class="social"> | ||
| <span class="contacticon center"> | ||
| <a href="mailto:{{ site.email | encode_email }}"><i class="fas fa-envelope"></i></a> | ||
| {% if site.orcid_id %}<a href="https://orcid.org/{{ site.orcid_id }}" target="_blank" title="ORCID"><i class="ai ai-orcid"></i></a>{% endif %} | ||
| {% 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 %} | ||
| {% if site.github_username %}<a href="https://github.com/{{ site.github_username }}" target="_blank" title="GitHub"><i class="fab fa-github"></i></a>{% endif %} | ||
| {% 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 %} | ||
| {% if site.twitter_username %}<a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" title="Twitter"><i class="fab fa-twitter"></i></a>{% endif %} | ||
| {% 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 %} | ||
| </span> | ||
|
|
||
| <div class="col three caption"> | ||
| {{ site.contact_note }} | ||
| </div> | ||
| </div> | ||
| <span class="contact-icon text-center"> | ||
| <a href="mailto:{{ site.email | encode_email }}"><i class="fas fa-envelope"></i></a> | ||
| {% if site.orcid_id %}<a href="https://orcid.org/{{ site.orcid_id }}" target="_blank" title="ORCID"><i class="ai ai-orcid"></i></a>{% endif %} | ||
| {% 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 %} | ||
| {% if site.github_username %}<a href="https://github.com/{{ site.github_username }}" target="_blank" title="GitHub"><i class="fab fa-github"></i></a>{% endif %} | ||
| {% 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 %} | ||
| {% if site.twitter_username %}<a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" title="Twitter"><i class="fab fa-twitter"></i></a>{% endif %} | ||
| {% 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 %} | ||
| </span> |
Oops, something went wrong.