diff --git a/Gemfile b/Gemfile index 8e842b1..454c78a 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ group :jekyll_plugins do gem 'github-pages' gem 'jekyll' gem 'jekyll-email-protect' - gem 'jekyll-paginate' + gem 'jekyll-paginate-v2' gem 'jekyll-scholar' gem 'jemoji' gem 'unicode_utils' diff --git a/_config.yml b/_config.yml index 721d41e..4ddea87 100644 --- a/_config.yml +++ b/_config.yml @@ -20,7 +20,7 @@ last_updated: false # set to true if you want to display last updated in the foo # ----------------------------------------------------------------------------- navbar_fixed: true -footer_fixed: false +footer_fixed: true # TODO: add layout settings (single page vs. multi-page) # ----------------------------------------------------------------------------- @@ -43,16 +43,17 @@ google_analytics: UA-XXXXXXXXX # out your google-analytics code blog_name: al-folio blog_description: a simple whitespace theme for academics +permalink: /blog/:year/:title/ # Pagination -paginate: 4 -permalink: /blog/:year/:title/ -paginate_path: /blog/page:num/ - -text: - pagination: - newer: 'Newer' - older: 'Older' +pagination: + enabled: true + collection: 'posts' + permalink: /page/:num/ + per_page: 3 + trail: + before: 1 # The number of links before the current page + after: 3 # The number of links after the current page # Comments disqus_shortname: al-folio # put your disqus shortname @@ -98,7 +99,7 @@ exclude: [vendor] # Plug-ins plugins: - jekyll-email-protect - - jekyll-paginate + - jekyll-paginate-v2 - jekyll/scholar - jemoji diff --git a/_includes/header.html b/_includes/header.html index b55758c..d8fa8ea 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -41,11 +41,11 @@ {% for p in site.pages %} - {% if p.title and p.url != "/" %} + {% if p.nav %}
  • {{ p.title }} - {% if page.nav == p.nav %} + {% if page.title == p.title %} (current) {% endif %} diff --git a/_includes/pagination.html b/_includes/pagination.html index 52fc87d..7d3f91d 100644 --- a/_includes/pagination.html +++ b/_includes/pagination.html @@ -1,23 +1,17 @@ -{% if paginator.total_pages != 1 %} - +
  • + Older +
    • + + {% endif %} diff --git a/_layouts/about.html b/_layouts/about.html index 683d186..243ef86 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -9,7 +9,7 @@ layout: page {% if page.profile %}
    {% if page.profile.image %} - + {% endif %} {% if page.profile.address %}
    diff --git a/_pages/projects.md b/_pages/projects.md index 06a24cb..36d2fe0 100644 --- a/_pages/projects.md +++ b/_pages/projects.md @@ -3,6 +3,7 @@ layout: page title: projects permalink: /projects/ description: A growing collection of your cool projects. +nav: true --- {% for project in site.projects %} diff --git a/_pages/publications.md b/_pages/publications.md index ae73d0c..802db4f 100644 --- a/_pages/publications.md +++ b/_pages/publications.md @@ -4,6 +4,7 @@ permalink: /publications/ title: publications description: Publications by categories in reversed chronological order. Generated by jekyll-scholar. years: [1956, 1950, 1935, 1905] +nav: true --- {% for y in page.years %} diff --git a/_pages/teaching.md b/_pages/teaching.md index 5a0c17f..ddcc59b 100644 --- a/_pages/teaching.md +++ b/_pages/teaching.md @@ -3,6 +3,7 @@ layout: page permalink: /teaching/ title: teaching description: Materials for courses you taught. Replace this text with your description. +nav: true --- For now, this page is assumed to be a static description of your courses. You can convert it to a collection similar to `_projects/` so that you can have a dedicated page for each course. diff --git a/_sass/_base.scss b/_sass/_base.scss index b74bc40..ae1137f 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -5,10 +5,10 @@ // Typography a, table.table a { - color: $link-color; + color: $theme-color; display: inline-block; &:hover { - color: $link-color; + color: $theme-color; text-decoration: underline; } &:hover:after { @@ -17,6 +17,7 @@ a, table.table a { } // Math + .equation { margin-bottom: 1rem; text-align: center; @@ -26,9 +27,6 @@ a, table.table a { // Profile .profile { - img { - box-shadow: 0 0 5px $grey-color; - } .address { font-family: monospace; font-size: 1.2rem; @@ -46,7 +44,6 @@ a, table.table a { border-bottom: 1px solid $grey-color-light; opacity: 0.95; } - .navbar.navbar-light { // Remove link decoration a { @@ -56,15 +53,15 @@ a, table.table a { } .navbar-nav .nav-item .nav-link { &:hover { - color: $link-color; + color: $theme-color; } } .navbar-nav .nav-item.active>.nav-link { background-color: inherit; - color: $link-color; + color: $theme-color; font-weight: bolder; &:hover { - color: $link-color; + color: $theme-color; } } .contact-icon { @@ -72,7 +69,7 @@ a, table.table a { a { color: $grey-color-dark; &:hover { - color: $link-color; + color: $theme-color; } } } @@ -115,11 +112,14 @@ a, table.table a { // News + .news table td { font-size: 1rem; } + // Social (bottom) + .social { text-align: center; .contact-icon { @@ -127,7 +127,7 @@ a, table.table a { a { color: $grey-color-dark; &:hover { - color: $link-color; + color: $theme-color; } } } @@ -147,7 +147,7 @@ footer.fixed-bottom { a { color: white; &:hover { - color: lighten($link-color, 25%); + color: lighten($theme-color, 25%); text-decoration: none; } } @@ -159,3 +159,48 @@ footer.sticky-bottom { padding-bottom: 40px; font-size: 0.9rem; } + + +// Blog + +.header-bar { + border-bottom: 1px solid $grey-color-light; + text-align: center; + padding-top: 2rem; + padding-bottom: 5rem; + h1 { + color: $theme-color; + font-size: 5rem; + } +} + +.post-list { + margin: 0; + margin-bottom: 40px; + padding: 0; + li { + border-bottom: 1px solid $grey-color-light; + list-style: none; + padding-top: 2rem; + padding-bottom: 2rem; + .post-meta { + color: $grey-color; + font-size: 0.875rem; + margin-bottom: 0; + } + a { + color: black; + text-decoration: none; + &:hover { + color: $theme-color; + } + } + } +} + +.pagination .page-item.active .page-link { + background-color: $theme-color; + &:hover { + background-color: $theme-color; + } +} diff --git a/blog/index.html b/blog/index.html index 3b67d71..5a6e096 100644 --- a/blog/index.html +++ b/blog/index.html @@ -1,5 +1,7 @@ --- layout: default +pagination: + enabled: true ---
    @@ -13,7 +15,7 @@ layout: default