Skip to content

Commit

Permalink
Update bootstrap and other library dependencies (alshedivat#741)
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit e036baf
Author: Rohan Deb Sarkar <[email protected]>
Date:   Sun Jan 1 14:31:41 2023 +0530

    Fix Altmetric badges

commit 970bad8
Merge: 7fe570d 69e013b
Author: Rohan Deb Sarkar <[email protected]>
Date:   Sun Jan 1 13:34:22 2023 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 7fe570d
Merge: 3f23bd3 5f3c487
Author: rohandebsarkar <[email protected]>
Date:   Mon Oct 17 12:58:30 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 3f23bd3
Author: rohandebsarkar <[email protected]>
Date:   Thu Oct 13 15:59:54 2022 +0530

    move teaching to dropdown menu

commit 9b05ef0
Author: rohandebsarkar <[email protected]>
Date:   Thu Oct 13 15:59:40 2022 +0530

    fix theme change icon width

commit e0e8cef
Merge: 1bd8267 7d7567e
Author: rohandebsarkar <[email protected]>
Date:   Thu Oct 13 15:29:41 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 1bd8267
Author: rohandebsarkar <[email protected]>
Date:   Mon Aug 29 18:50:32 2022 +0530

    update mdb version

commit 63a1bf7
Author: rohandebsarkar <[email protected]>
Date:   Tue Aug 16 18:33:27 2022 +0530

    fix publications badge color

commit 2320adc
Author: rohandebsarkar <[email protected]>
Date:   Mon Aug 15 20:41:15 2022 +0530

    fix mdbootstrap script loading

commit 73aa4f2
Merge: e1ed167 c142853
Author: rohandebsarkar <[email protected]>
Date:   Mon Aug 15 08:44:00 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit e1ed167
Merge: ccac0d8 a36d7f5
Author: rohandebsarkar <[email protected]>
Date:   Sun Aug 7 10:51:21 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit ccac0d8
Merge: 20125e3 4817639
Author: rohandebsarkar <[email protected]>
Date:   Thu Jul 28 21:57:19 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 20125e3
Merge: 1e64134 f618757
Author: rohandebsarkar <[email protected]>
Date:   Sun Jul 24 22:49:10 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 1e64134
Author: rohandebsarkar <[email protected]>
Date:   Sat Jul 16 10:36:04 2022 +0530

    Update `sr-only` to `visually-hidden`

commit 8fce0bb
Author: rohandebsarkar <[email protected]>
Date:   Fri Jul 15 21:02:01 2022 +0530

    fix dropdown border radius

commit c1904f8
Author: rohandebsarkar <[email protected]>
Date:   Wed Jul 13 11:35:22 2022 +0530

    cv margin bottom

commit 44696e6
Author: rohandebsarkar <[email protected]>
Date:   Wed Jul 13 11:20:38 2022 +0530

    typo

commit ed883fc
Merge: 271567f 1ac9b7c
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 12 17:26:21 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 271567f
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 22:39:40 2022 +0530

    Update card spacing

commit 8c28c98
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 22:33:31 2022 +0530

    fix spacing publication links

commit ed7ac19
Merge: e939946 24a5084
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 22:11:44 2022 +0530

    Merge remote-tracking branch 'upstream/master' into update-bootstrap

commit e939946
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 22:10:22 2022 +0530

    fix blog paginantion bg color

commit 9564dd9
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 22:00:28 2022 +0530

    fix dropdown focus bg color

commit 27ba43b
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 11:19:47 2022 +0530

    move canonical url to metadata

commit 80d027c
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 11:15:07 2022 +0530

    made material design optional

commit 6a6c6a1
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 11:05:19 2022 +0530

    fix space

commit 436e3aa
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 10:52:38 2022 +0530

    fix header title

commit 263d11b
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 10:49:05 2022 +0530

    enable tooltips

commit 2f2573b
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 10:47:42 2022 +0530

    Add option for material design and update MDBootstrap

commit 4811a10
Merge: 2f1ea24 edd9fb7
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 11 10:41:12 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 2f1ea24
Author: rohandebsarkar <[email protected]>
Date:   Sun Jul 10 09:02:01 2022 +0530

    sorry, fix badge again agian again

commit 323217f
Author: rohandebsarkar <[email protected]>
Date:   Sun Jul 10 08:28:55 2022 +0530

    fix badge again again

commit 7d8ed94
Author: rohandebsarkar <[email protected]>
Date:   Sun Jul 10 08:12:39 2022 +0530

    fix badge again

commit 511b969
Author: rohandebsarkar <[email protected]>
Date:   Sun Jul 10 07:51:02 2022 +0530

    fix badge

commit 7b59dfd
Author: rohandebsarkar <[email protected]>
Date:   Sat Jul 9 21:58:33 2022 +0530

    fix profile

commit 0474573
Merge: 4042036 9d71804
Author: rohandebsarkar <[email protected]>
Date:   Sat Jul 9 21:05:27 2022 +0530

    Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap

commit 4042036
Author: rohandebsarkar <[email protected]>
Date:   Sat Jul 9 20:46:36 2022 +0530

    Update hover to `--global-hover-color` colors

commit eaa6de2
Author: rohandebsarkar <[email protected]>
Date:   Sat Jul 9 19:19:31 2022 +0530

    Update responsive profile image margin

commit 955c0c5
Author: rohandebsarkar <[email protected]>
Date:   Wed Jul 6 16:44:06 2022 +0530

    remove <b> in cv map

commit 637c598
Author: rohandebsarkar <[email protected]>
Date:   Wed Jul 6 12:30:56 2022 +0530

    badge width fix

commit a94d671
Author: rohandebsarkar <[email protected]>
Date:   Wed Jul 6 11:06:25 2022 +0530

    fix post bullets

commit 1905fa0
Author: rohandebsarkar <[email protected]>
Date:   Wed Jul 6 09:29:20 2022 +0530

    consisten bottom margin

commit a54b88e
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 22:37:41 2022 +0530

    fix blog tag color

commit 69d8d3a
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 20:24:41 2022 +0530

    update blog post-tags style

commit ad9c57f
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 19:41:53 2022 +0530

    update publication abbr badge

commit 7891f8d
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 19:22:05 2022 +0530

    fix responsive cv badge

commit 84fcc52
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 18:44:23 2022 +0530

    fix cv map padding

commit 1e0f0ea
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 16:51:46 2022 +0530

    update body container margin

commit 663e04b
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 16:46:17 2022 +0530

    fie responsive navbar border

commit 70373fe
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 14:41:09 2022 +0530

    update body paddings

commit 9a50c00
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 14:22:32 2022 +0530

    update footer sticky-bottom  style

commit 26be662
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 14:19:25 2022 +0530

    update address style

commit e977c30
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 14:12:29 2022 +0530

    update cv badge style

commit 2ea5420
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 14:08:42 2022 +0530

    Update footer style

commit 89cf3e7
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 14:04:00 2022 +0530

    replace dropdown divider with <hr>

commit 1dc0a05
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 12:14:19 2022 +0530

    fix cv text color

commit 86075d4
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 12:08:52 2022 +0530

    Revert "fix publication year color"

    This reverts commit da1888b.

commit 1ac23e9
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 12:08:49 2022 +0530

    Revert "fix font color"

    This reverts commit 9348728.

commit da1888b
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 11:58:14 2022 +0530

    fix publication year color

commit 66a293d
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 11:56:48 2022 +0530

    fix cv preview (fix previous commit) (previous one was done by mistake)

commit 0c61288
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 11:42:31 2022 +0530

    fix publication preview (`max-width` is determined by bootstrap in v5)

commit a53b51b
Author: rohandebsarkar <[email protected]>
Date:   Tue Jul 5 09:39:26 2022 +0530

    fix cv time_table badge

commit 94ff515
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 21:09:09 2022 +0530

    add empty line to `map.html`

commit c5d3f9c
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 15:49:27 2022 +0530

    Update blog tag padding

commit f46d4cc
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 15:39:39 2022 +0530

    add padding to cv pdf icon

commit ae5509f
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 15:37:20 2022 +0530

    fix cv time_table

commit e8b3f86
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 15:34:21 2022 +0530

    fix cv map

commit 52ffe49
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 15:10:57 2022 +0530

    fix cv pdf icon

commit 3c81d31
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 15:06:17 2022 +0530

    remove baseurl (deployment problem) (will be reverted before merging)

commit 691b164
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 15:04:52 2022 +0530

    fix responsive navbar shadow

commit 89be84f
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 14:52:42 2022 +0530

    fix responsive navbar

commit 3b57133
Merge: 6fd8b93 fc52217
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 12:46:38 2022 +0530

    Merge branch 'remove-library-subversions' into update-bootstrap

commit 6fd8b93
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 12:34:28 2022 +0530

    fix footer text

commit 9348728
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 12:13:30 2022 +0530

    fix font color

commit fc52217
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 11:59:26 2022 +0530

    Update cv pdf icon

commit 97a2210
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 11:45:00 2022 +0530

    fix `font-weight`

commit 780fd4f
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 11:34:18 2022 +0530

    fix <hr>

commit 9a34957
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 11:15:45 2022 +0530

    Update a

commit 16560d5
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 11:07:19 2022 +0530

    fix badge

commit 8f466ea
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 09:43:27 2022 +0530

    fix `data-toggle`

commit 925049c
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 08:34:55 2022 +0530

    fix alignment

commit cb59020
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 08:34:47 2022 +0530

    upgrade bootstrap

commit 2090f56
Author: rohandebsarkar <[email protected]>
Date:   Mon Jul 4 08:19:03 2022 +0530

    Reduced libraries to major version only for automatic updates
  • Loading branch information
@rohandebsarkar
rohandebsarkar committed Jan 1, 2023
1 parent 55cc55c commit 37fd51d
Show file tree
Hide file tree
Showing 21 changed files with 167 additions and 168 deletions.
49 changes: 21 additions & 28 deletions _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ footer_text: >
keywords: jekyll, jekyll-theme, academic-website, portfolio-website # add your own keywords or leave empty

lang: en # the language of your site (for example: en, fr, cn, ru, etc.)
icon: ⚛️ # the emoji used as the favicon (alternatively, provide image name in /assets/img/)
icon: ⚛️ # the emoji used as the favicon (alternatively, provide image name in /assets/img/)

url: https://alshedivat.github.io # the base hostname & protocol for your site
baseurl: /al-folio # the subpath of your site, e.g. /blog/
# baseurl: /al-folio # the subpath of your site, e.g. /blog/
last_updated: false # set to true if you want to display last updated in the footer
impressum_path: # set to path to include impressum link in the footer, use the same path as permalink in a page, helps to conform with EU GDPR
impressum_path: # set to path to include impressum link in the footer, use the same path as permalink in a page, helps to conform with EU GDPR

# -----------------------------------------------------------------------------
# Theme
Expand Down Expand Up @@ -328,48 +328,41 @@ jekyll-diagrams:

enable_google_analytics: false # enables google analytics
enable_panelbear_analytics: false # enables panelbear analytics
enable_google_verification: false # enables google site verification

enable_bing_verification: false # enables bing site verification
enable_google_verification: false # enables google site verification

enable_darkmode: true # enables switching between light/dark modes
enable_masonry: true # enables automatic project cards arangement
enable_material_design: true # enables material deisgn (uses MDBootstrap)
enable_math: true # enables math typesetting (uses MathJax)
enable_tooltips: false # enables automatic tooltip links generated
# for each section titles on pages and posts
enable_darkmode: true # enables switching between light/dark modes
enable_medium_zoom: true # enables image zoom feature (as on medium.com)
enable_navbar_social: false # enables displaying social links in the
# navbar on the about page
enable_progressbar: true # enables a horizontal progress bar linked to the vertical scroll position
enable_project_categories: true # enables categorization of projects into
# multiple categories
enable_medium_zoom: true # enables image zoom feature (as on medium.com)
enable_progressbar: true # enables a horizontal progress bar linked to the vertical scroll position
enable_tooltips: true # enables automatic tooltip links generated
# for each section titles on pages and posts


# -----------------------------------------------------------------------------
# Library versions
# -----------------------------------------------------------------------------

academicons:
version: "1.9.1"
integrity: "sha256-i1+4qU2G2860dGGIOJscdC30s9beBXjFfzjWLjBRsBg="
version: "1"
bootstrap:
version: "4.6.1"
integrity:
css: "sha256-DF7Zhf293AJxJNTmh5zhoYYIMs2oXitRfBjY+9L//AY="
js: "sha256-fgLAgv7fyCGopR/gBNq2iW3ZKIdqIcyshnUULC4vex8="
version: "5"
fontawesome:
version: "5.15.4"
integrity: "sha256-mUZM63G8m73Mcidfrv5E+Y61y7a12O5mW4ezU3bxqW4="
version: "6"
jquery:
version: "3.6.0"
integrity: "sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4="
version: "3"
mathjax:
version: "3.2.0"
version: "3"
masonry:
version: "4.2.2"
integrity: "sha256-Nn1q/fx0H7SNLZMQ5Hw5JLaTRZp0yILA/FRexe19VdI="
version: "4"
mdb:
version: "4.20.0"
integrity:
css: "sha256-jpjYvU3G3N6nrrBwXJoVEYI/0zw8htfFnhT9ljN3JJw="
js: "sha256-NdbiivsvWt7VYCt6hYNT3h/th9vSTL4EDWeGs5SN3DA="
version: "5"
medium_zoom:
version: "1.0.6"
integrity: "sha256-EdPgYcPk/IIrw7FYeuJQexva49pVRZNmt3LculEr7zM="
version: "1"
2 changes: 1 addition & 1 deletion _includes/cv/list.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul class="card-text font-weight-light list-group list-group-flush">
<ul class="card-text fw-light list-group list-group-flush">
{% for content in entry.contents %}
<li class="list-group-item">{{ content }}</li>
{% endfor %}
Expand Down
8 changes: 4 additions & 4 deletions _includes/cv/map.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<table class="table table-sm table-borderless table-responsive">
<table class="table table-sm table-borderless table-responsive d-block">
{% for content in entry.contents %}
<tr>
<td class="p-1 pr-2 font-weight-bold"><b>{{ content.name }}</b></td>
<td class="p-1 pl-2 font-weight-light text">{{ content.value }}</td>
<td class="p-2 pe-4 fw-bold">{{ content.name }}</td>
<td class="p-2 ps-4 fw-light text">{{ content.value }}</td>
</tr>
{% endfor %}
</table>
</table>
2 changes: 1 addition & 1 deletion _includes/cv/nested_list.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul class="card-text font-weight-light list-group list-group-flush">
<ul class="card-text fw-light list-group list-group-flush">
{% for content in entry.contents %}
<li class="list-group-item">
<h5 class="font-italic">{{ content.title }}</h5>
Expand Down
14 changes: 7 additions & 7 deletions _includes/cv/time_table.html
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<ul class="card-text font-weight-light list-group list-group-flush">
<ul class="card-text fw-light list-group list-group-flush">
{% for content in entry.contents %}
<li class="list-group-item">
<div class="row">
{% if content.year %}
<div class="col-xs-2 cl-sm-2 col-md-2 text-center" style="width: 75px;">
<span class="badge font-weight-bold danger-color-dark text-uppercase align-middle" style="min-width: 75px;">
<div class="col-xs-2 cs-sm-2 col-md-2">
<span class="badge d-md-flex fw-bold justify-content-center align-middle">
{{ content.year }}
</span>
</div>
{% endif %}
<div class="col-xs-10 cl-sm-10 col-md-10 mt-2 mt-md-0">
<div class="col-xs-10 cs-sm-10 col-md-10 mt-2 mt-md-0">
{% if content.title %}
<h6 class="title font-weight-bold ml-1 ml-md-4">{{content.title}}</h6>
<h6 class="title fw-bold ms-1 ms-md-4">{{content.title}}</h6>
{% endif %}
{% if content.institution %}
<h6 class="ml-1 ml-md-4" style="font-size: 0.95rem;">{{content.institution}}</h6>
<h6 class="ms-1 ms-md-4" style="font-size: 0.95rem;">{{content.institution}}</h6>
{% endif %}
{% if content.description %}
<ul class="items">
<ul class="items ms-2">
{% for item in content.description %}
<li>
{% if item.contents %}
Expand Down
15 changes: 10 additions & 5 deletions _includes/head.html
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
<!-- Metadata, OpenGraph and Schema.org -->
{% include metadata.html %}

<!-- Bootstrap & MDB -->
<!-- Bootstrap -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@{{ site.bootstrap.version }}/dist/css/bootstrap.min.css" rel="stylesheet" integrity="{{ site.bootstrap.integrity.css }}" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/mdbootstrap@{{ site.mdb.version }}/css/mdb.min.css" integrity="{{ site.mdb.integrity.css }}" crossorigin="anonymous" />

<!-- Fonts & Icons -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{ site.fontawesome.version }}/css/all.min.css" integrity="{{ site.fontawesome.integrity }}" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/academicons@{{ site.academicons.version }}/css/academicons.min.css" integrity="{{ site.academicons.integrity }}" crossorigin="anonymous">
<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">

{% if site.enable_material_design %}
<!-- MDBootstrap -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/mdb-ui-kit@{{ site.mdb.version }}/css/mdb.min.css" integrity="{{ site.mdb.integrity.css }}" crossorigin="anonymous" />
{% endif %}

<!-- Code Syntax Highlighting -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/jwarby/jekyll-pygments-themes@master/{{ site.highlight_theme_light | append: '.css' }}" media="" id="highlight_theme_light" />

<!-- Styles -->
<!-- Favicon -->
{% if site.icon.size < 3 %}
<link rel="shortcut icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>{{ site.icon }}</text></svg>">
{% elsif site.icon != blank %}
<link rel="shortcut icon" href="{{ site.icon | prepend: '/assets/img/' | relative_url}}"/>
{% endif %}

<!-- Custom Stylessheet -->
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">

<!-- Dark Mode -->
{% if site.enable_darkmode %}
Expand Down
26 changes: 13 additions & 13 deletions _includes/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<nav id="navbar" class="navbar navbar-light navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
<div class="container">
{% if page.permalink != '/' -%}
<a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl }}/">
<a class="navbar-brand title fw-lighter" href="{{ site.baseurl }}/">
{%- if site.title == "blank" -%}
{%- if site.first_name -%}
<span class="font-weight-bold">{{- site.first_name -}}&nbsp;</span>
<span class="fw-bold">{{- site.first_name -}}&nbsp;</span>
{%- endif -%}
{%- if site.middle_name -%}
{{- site.middle_name -}}&nbsp;
Expand All @@ -27,15 +27,15 @@
</div>
{% endif %}
<!-- Navbar Toggle -->
<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>
<button class="navbar-toggler collapsed ms-auto" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="visually-hidden">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">
<div class="collapse navbar-collapse text-end" id="navbarNav">
<ul class="navbar-nav ms-auto flex-nowrap">

{%- for page in site.pages -%}
{% if page.permalink == '/' %}
Expand All @@ -47,7 +47,7 @@
<li class="nav-item {% if page.permalink == '/' %}active{% endif %}">
<a class="nav-link" href="{{ '/' | relative_url }}">{{ about_title }}
{%- if page.permalink == '/' -%}
<span class="sr-only">(current)</span>
<span class="visually-hidden">(current)</span>
{%- endif -%}
</a>
</li>
Expand All @@ -56,7 +56,7 @@
<li class="nav-item {% if page.url contains 'blog' %}active{% endif %}">
<a class="nav-link" href="{{ '/blog/' | relative_url }}">{{ site.blog_nav_title }}
{%- if page.url contains 'blog' -%}
<span class="sr-only">(current)</span>
<span class="visually-hidden">(current)</span>
{%- endif -%}
</a>
</li>
Expand All @@ -68,15 +68,15 @@
{%- if p.nav and p.autogen == nil -%}
{%- if p.dropdown %}
<li class="nav-item dropdown {% if page.title == p.title %}active{% endif %}">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ p.title }}
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ p.title }}
{%- if page.title == p.title -%}
<span class="sr-only">(current)</span>
<span class="visually-hidden">(current)</span>
{%- endif -%}
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
{%- for child in p.children -%}
{%- if child.title == 'divider' %}
<div class="dropdown-divider"></div>
<hr>
{%- else %}
<a class="dropdown-item" href="{{ child.permalink | relative_url }}">{{ child.title }}</a>
{%- endif -%}
Expand All @@ -87,7 +87,7 @@
<li class="nav-item {% if page.title == p.title %}active{% endif %}">
<a class="nav-link" href="{{ p.url | relative_url }}">{{ p.title }}
{%- if page.title == p.title -%}
<span class="sr-only">(current)</span>
<span class="visually-hidden">(current)</span>
{%- endif -%}
</a>
</li>
Expand Down
4 changes: 3 additions & 1 deletion _includes/metadata.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
</title>
<meta name="author" content="{{ site.first_name }} {{ site.middle_name }} {{ site.last_name }}" />
<meta name="description" content="{%- if page.description -%}{{ page.description }}{%- else -%}{{ site.description }}{%- endif -%}" />
{%- if page.keywords or site.keywords %}
<link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">

{%- if page.keywords or site.keywords %}
<meta name="keywords" content="{%- if page.keywords -%}{{ page.keywords }}{%- else -%}{{ site.keywords }}{%- endif -%}" />
{%- endif %}

Expand Down
2 changes: 1 addition & 1 deletion _includes/projects.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="card-body">
<h2 class="card-title text-lowercase">{{ project.title }}</h2>
<p class="card-text">{{ project.description }}</p>
<div class="row ml-1 mr-1 p-0">
<div class="row ms-1 me-1 p-0">
{%- if project.github -%}
<div class="github-icon">
<div class="icon" data-toggle="tooltip" title="Code Repository">
Expand Down
2 changes: 1 addition & 1 deletion _includes/projects_horizontal.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="card-body">
<h3 class="card-title text-lowercase">{{ project.title }}</h3>
<p class="card-text">{{ project.description }}</p>
<div class="row ml-1 mr-1 p-0">
<div class="row ms-1 me-1 p-0">
{%- if project.github -%}
<div class="github-icon">
<div class="icon" data-toggle="tooltip" title="Code Repository">
Expand Down
10 changes: 7 additions & 3 deletions _includes/scripts/bootstrap.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<!-- Bootsrap & MDB scripts -->
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@{{ site.bootstrap.version }}/dist/js/bootstrap.bundle.min.js" integrity="{{ site.bootstrap.integrity.js }}" crossorigin="anonymous"></script>
<script defer src="https://cdn.jsdelivr.net/npm/mdbootstrap@{{ site.mdb.version }}/js/mdb.min.js" integrity="{{ site.mdb.integrity.js }}" crossorigin="anonymous"></script>
<!-- Bootsrap script -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@{{ site.bootstrap.version }}/dist/js/bootstrap.bundle.min.js" integrity="{{ site.bootstrap.integrity.js }}" crossorigin="anonymous"></script>

{% if site.enable_material_design %}
<!-- MDBootstrap script -->
<script src="https://cdn.jsdelivr.net/npm/mdb-ui-kit@{{ site.mdb.version }}/js/mdb.min.js" integrity="{{ site.mdb.integrity.js }}" crossorigin="anonymous"></script>
{% endif %}
4 changes: 2 additions & 2 deletions _layouts/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<div class="post">
<header class="post-header">
<h1 class="post-title">
{% if site.title == "blank" -%}<span class="font-weight-bold">{{ site.first_name }}</span> {{ site.middle_name }} {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif %}
{% if site.title == "blank" -%}<span class="fw-bold">{{ site.first_name }}</span> {{ site.middle_name }} {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif %}
</h1>
<p class="desc">{{ page.subtitle }}</p>
</header>

<article>
{% if page.profile -%}
<div class="profile float-{%- if page.profile.align == 'left' -%}left{%- else -%}right{%- endif -%}">
<div class="profile float-{%- if page.profile.align == 'left' -%}start{%- else -%}end{%- endif -%}">
{%- if page.profile.image %}
{%- assign profile_image_path = page.profile.image | prepend: 'assets/img/' -%}

Expand Down
11 changes: 4 additions & 7 deletions _layouts/bib.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@
{%- endif -%}
{%- elsif entry.abbr -%}
{%- if site.data.venues[entry.abbr] -%}
{%- assign venue_style = nil -%}
{%- if site.data.venues[entry.abbr].color != blank -%}
{%- assign venue_style = site.data.venues[entry.abbr].color | prepend: 'style="background-color:' | append: '"' -%}
{%- endif -%}
<abbr class="badge" {% if venue_style %}{{venue_style}}{% endif %}><a href="{{site.data.venues[entry.abbr].url}}">{{entry.abbr}}</a></abbr>
<abbr class="badge d-md-flex fw-bold justify-content-center align-middle"><a href="{{site.data.venues[entry.abbr].url}}">{{entry.abbr}}</a></abbr>
{%- else -%}
<abbr class="badge">{{entry.abbr}}</abbr>
<abbr class="badge d-md-flex fw-bold justify-content-center align-middle">{{entry.abbr}}</abbr>
{%- endif -%}
{%- endif -%}
</div>
Expand Down Expand Up @@ -181,7 +177,8 @@
<a href="{{ entry.website }}" class="btn btn-sm z-depth-0" role="button">Website</a>
{%- endif %}
{%- if entry.altmetric %}
<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script><div data-altmetric-id="{{ entry.altmetric }}" class="altmetric-embed" data-hide-no-mentions="true" data-hide-less-than="15" data-badge-popover="right" data-badge-type="2" style="display:inline"></div>
<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>
<div data-altmetric-id="{{ entry.altmetric }}" class="altmetric-embed p-2" data-hide-no-mentions="true" data-hide-less-than="15" data-badge-popover="right" data-badge-type="2" style="display:inline-block;"></div>
{%- endif %}
</div>

Expand Down
4 changes: 2 additions & 2 deletions _layouts/cv.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<div class="post">

<header class="post-header">
<h1 class="post-title">{{ page.title }} {% if page.cv_pdf %}<a href="{{ page.cv_pdf | prepend: 'assets/pdf/' | relative_url}}" target="_blank" rel="noopener noreferrer" class="float-right"><i class="fas fa-file-pdf"></i></a>{% endif %}</h1>
<h1 class="post-title">{{ page.title }} {% if page.cv_pdf %}<a href="{{ page.cv_pdf | prepend: 'assets/pdf/' | relative_url}}" target="_blank" rel="noopener noreferrer" class="float-end pe-2"><i class="fas fa-xl fa-file-pdf"></i></a>{% endif %}</h1>
<p class="post-description">{{ page.description }}</p>
</header>

<article>
<div class="cv">
{% for entry in site.data.cv %}
<div class="card mt-3 p-3">
<h3 class="card-title font-weight-medium">{{ entry.title }}</h3>
<h3 class="card-title fw-medium">{{ entry.title }}</h3>
<div>
{% if entry.type == "list" %}
{% include cv/list.html %}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{%- include header.html %}

<!-- Content -->
<div class="container mt-5">
<div class="container mt-4">
{{ content }}
</div>

Expand Down
Loading

0 comments on commit 37fd51d

Please sign in to comment.