Skip to content
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

Update bootstrap and other library dependencies #741

Open
wants to merge 84 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
2090f56
Reduced libraries to major version only for automatic updates
rohandebsarkar Jul 4, 2022
cb59020
upgrade bootstrap
rohandebsarkar Jul 4, 2022
925049c
fix alignment
rohandebsarkar Jul 4, 2022
8f466ea
fix `data-toggle`
rohandebsarkar Jul 4, 2022
16560d5
fix badge
rohandebsarkar Jul 4, 2022
9a34957
Update a
rohandebsarkar Jul 4, 2022
780fd4f
fix <hr>
rohandebsarkar Jul 4, 2022
97a2210
fix `font-weight`
rohandebsarkar Jul 4, 2022
fc52217
Update cv pdf icon
rohandebsarkar Jul 4, 2022
9348728
fix font color
rohandebsarkar Jul 4, 2022
6fd8b93
fix footer text
rohandebsarkar Jul 4, 2022
3b57133
Merge branch 'remove-library-subversions' into update-bootstrap
rohandebsarkar Jul 4, 2022
89be84f
fix responsive navbar
rohandebsarkar Jul 4, 2022
691b164
fix responsive navbar shadow
rohandebsarkar Jul 4, 2022
3c81d31
remove baseurl (deployment problem) (will be reverted before merging)
rohandebsarkar Jul 4, 2022
52ffe49
fix cv pdf icon
rohandebsarkar Jul 4, 2022
e8b3f86
fix cv map
rohandebsarkar Jul 4, 2022
ae5509f
fix cv time_table
rohandebsarkar Jul 4, 2022
f46d4cc
add padding to cv pdf icon
rohandebsarkar Jul 4, 2022
c5d3f9c
Update blog tag padding
rohandebsarkar Jul 4, 2022
94ff515
add empty line to `map.html`
rohandebsarkar Jul 4, 2022
a53b51b
fix cv time_table badge
rohandebsarkar Jul 5, 2022
0c61288
fix publication preview (`max-width` is determined by bootstrap in v5)
rohandebsarkar Jul 5, 2022
66a293d
fix cv preview (fix previous commit) (previous one was done by mistake)
rohandebsarkar Jul 5, 2022
da1888b
fix publication year color
rohandebsarkar Jul 5, 2022
1ac23e9
Revert "fix font color"
rohandebsarkar Jul 5, 2022
86075d4
Revert "fix publication year color"
rohandebsarkar Jul 5, 2022
1dc0a05
fix cv text color
rohandebsarkar Jul 5, 2022
89cf3e7
replace dropdown divider with <hr>
rohandebsarkar Jul 5, 2022
2ea5420
Update footer style
rohandebsarkar Jul 5, 2022
e977c30
update cv badge style
rohandebsarkar Jul 5, 2022
26be662
update address style
rohandebsarkar Jul 5, 2022
9a50c00
update footer sticky-bottom style
rohandebsarkar Jul 5, 2022
70373fe
update body paddings
rohandebsarkar Jul 5, 2022
663e04b
fie responsive navbar border
rohandebsarkar Jul 5, 2022
1e0f0ea
update body container margin
rohandebsarkar Jul 5, 2022
84fcc52
fix cv map padding
rohandebsarkar Jul 5, 2022
7891f8d
fix responsive cv badge
rohandebsarkar Jul 5, 2022
ad9c57f
update publication abbr badge
rohandebsarkar Jul 5, 2022
69d8d3a
update blog post-tags style
rohandebsarkar Jul 5, 2022
a54b88e
fix blog tag color
rohandebsarkar Jul 5, 2022
1905fa0
consisten bottom margin
rohandebsarkar Jul 6, 2022
a94d671
fix post bullets
rohandebsarkar Jul 6, 2022
637c598
badge width fix
rohandebsarkar Jul 6, 2022
955c0c5
remove <b> in cv map
rohandebsarkar Jul 6, 2022
eaa6de2
Update responsive profile image margin
rohandebsarkar Jul 9, 2022
4042036
Update hover to `--global-hover-color` colors
rohandebsarkar Jul 9, 2022
0474573
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Jul 9, 2022
7b59dfd
fix profile
rohandebsarkar Jul 9, 2022
511b969
fix badge
rohandebsarkar Jul 10, 2022
7d8ed94
fix badge again
rohandebsarkar Jul 10, 2022
323217f
fix badge again again
rohandebsarkar Jul 10, 2022
2f1ea24
sorry, fix badge again agian again
rohandebsarkar Jul 10, 2022
4811a10
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Jul 11, 2022
2f2573b
Add option for material design and update MDBootstrap
rohandebsarkar Jul 11, 2022
263d11b
enable tooltips
rohandebsarkar Jul 11, 2022
436e3aa
fix header title
rohandebsarkar Jul 11, 2022
6a6c6a1
fix space
rohandebsarkar Jul 11, 2022
80d027c
made material design optional
rohandebsarkar Jul 11, 2022
27ba43b
move canonical url to metadata
rohandebsarkar Jul 11, 2022
9564dd9
fix dropdown focus bg color
rohandebsarkar Jul 11, 2022
e939946
fix blog paginantion bg color
rohandebsarkar Jul 11, 2022
ed7ac19
Merge remote-tracking branch 'upstream/master' into update-bootstrap
rohandebsarkar Jul 11, 2022
8c28c98
fix spacing publication links
rohandebsarkar Jul 11, 2022
271567f
Update card spacing
rohandebsarkar Jul 11, 2022
ed883fc
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Jul 12, 2022
44696e6
typo
rohandebsarkar Jul 13, 2022
c1904f8
cv margin bottom
rohandebsarkar Jul 13, 2022
8fce0bb
fix dropdown border radius
rohandebsarkar Jul 15, 2022
1e64134
Update `sr-only` to `visually-hidden`
rohandebsarkar Jul 16, 2022
20125e3
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Jul 24, 2022
ccac0d8
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Jul 28, 2022
e1ed167
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Aug 7, 2022
73aa4f2
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Aug 15, 2022
2320adc
fix mdbootstrap script loading
rohandebsarkar Aug 15, 2022
63a1bf7
fix publications badge color
rohandebsarkar Aug 16, 2022
1bd8267
update mdb version
rohandebsarkar Aug 29, 2022
e0e8cef
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Oct 13, 2022
9b05ef0
fix theme change icon width
rohandebsarkar Oct 13, 2022
3f23bd3
move teaching to dropdown menu
rohandebsarkar Oct 13, 2022
7fe570d
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Oct 17, 2022
970bad8
Merge branch 'master' of https://github.com/alshedivat/al-folio into …
rohandebsarkar Jan 1, 2023
e036baf
Fix Altmetric badges
rohandebsarkar Jan 1, 2023
7026836
Merge branch 'master' into update-bootstrap
rohandebsarkar Feb 12, 2023
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
32 changes: 10 additions & 22 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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/)

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/
Copy link
Collaborator Author

@rohandebsarkar rohandebsarkar Jul 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed baseurl since it is causing some problems while deploying this branch on Vercel. I will revert this change before merging this PR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# baseurl: /al-folio # the subpath of your site, e.g. /blog/
baseurl: /al-folio # the subpath of your site, e.g. /blog/

Has to be done before merging.

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

Expand Down Expand Up @@ -292,32 +292,20 @@ enable_medium_zoom: true # enables image zoom feature (as on medium.co
# -----------------------------------------------------------------------------

academicons:
version: "1.9.1"
integrity: "sha256-i1+4qU2G2860dGGIOJscdC30s9beBXjFfzjWLjBRsBg="
version: "1"
bootstrap:
version: "4.6.1"
integrity:
css: "sha256-DF7Zhf293AJxJNTmh5zhoYYIMs2oXitRfBjY+9L//AY="
js: "sha256-SyTu6CwrfOhaznYZPoolVw2rxoY7lKYKQvqbtqN93HI="
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: "4"
popper:
version: "2.11.2"
integrity: "sha256-l/1pMF/+J4TThfgARS6KwWrk/egwuVvhRzfLAMQ6Ds4="
version: "2"
medium_zoom:
version: "1.0.6"
integrity: "sha256-EdPgYcPk/IIrw7FYeuJQexva49pVRZNmt3LculEr7zM="
version: "1"
2 changes: 1 addition & 1 deletion _includes/cv/list.html
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
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-5 fw-bold"><b>{{ content.name }}</b></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
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
12 changes: 6 additions & 6 deletions _includes/cv/time_table.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<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 fw-bold danger-color-dark text-uppercase align-middle" style="min-width: 75px;">
{{ 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">
Expand Down
14 changes: 7 additions & 7 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<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 | prepend: site.url }}/">
{%- if site.title == "blank" -%}<span class="font-weight-bold">{{ site.first_name }}</span> {{ site.middle_name }} {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif -%}
<a class="navbar-brand title fw-lighter" href="{{ site.baseurl | prepend: site.url }}/">
{%- if site.title == "blank" -%}<span class="fw-bold">{{ site.first_name }}</span> {{ site.middle_name }} {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif -%}
</a>
{%- elsif site.enable_navbar_social -%}
<!-- Social Icons -->
Expand All @@ -15,15 +15,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">
<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="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">
<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 Down Expand Up @@ -56,12 +56,12 @@
{%- 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>
{%- 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>
Expand Down
2 changes: 1 addition & 1 deletion _includes/projects.html
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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
4 changes: 2 additions & 2 deletions _layouts/about.html
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
4 changes: 2 additions & 2 deletions _layouts/cv.html
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
19 changes: 14 additions & 5 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
// Typography

p, h1, h2, h3, h4, h5, h6, em, div, li, span, strong {
color: var(--global-text-color);
color: var(--global-text-color) !important;
}

hr {
border-top: 1px solid var(--global-divider-color);
height: 1px;
background-color: var(--global-divider-color);
border: none;
opacity: 1;
}

table {
Expand All @@ -23,6 +26,8 @@ table {

a, table.table a {
color: var(--global-theme-color);
text-decoration: none;

&:hover {
color: var(--global-theme-color);
text-decoration: underline;
Expand Down Expand Up @@ -199,6 +204,10 @@ blockquote {
}

.navbar-toggler {
&:focus {
outline: none;
box-shadow: none;
}
.icon-bar {
display: block;
width: 22px;
Expand Down Expand Up @@ -272,7 +281,7 @@ footer.fixed-bottom {
background-color: var(--global-footer-bg-color);
font-size: 0.75rem;
.container {
color: var(--global-footer-text-color);
color: var(--global-footer-text-color) !important;
padding-top: 9px;
padding-bottom: 8px;
}
Expand Down Expand Up @@ -328,7 +337,7 @@ footer.sticky-bottom {
.tag-list {
border-bottom: 1px solid var(--global-divider-color);
text-align: center;
padding-top: 1rem;
padding: 1rem;

ul {
justify-content: center;
Expand All @@ -337,7 +346,7 @@ footer.sticky-bottom {
p, li {
list-style: none;
display: inline-block;
padding: 1rem 0.5rem;
padding: 0.5rem;
color: var(--global-text-color-light);
}
}
Expand Down
2 changes: 1 addition & 1 deletion blog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h2>{{ site.blog_description }}</h2>
<i class="fas fa-hashtag fa-sm"></i> <a href="{{ tag | prepend: '/blog/tag/' | relative_url }}">{{ tag }}</a>
</li>
{% unless forloop.last %}
<p>&bull;</p>
&bull;
{% endunless %}
{% endfor %}
</ul>
Expand Down