Skip to content

Commit 0474573

Browse files
Merge branch 'master' of https://github.com/alshedivat/al-folio into update-bootstrap
2 parents 4042036 + 9d71804 commit 0474573

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,14 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
- name: Setup Ruby
2020
uses: ruby/setup-ruby@v1
2121
with:
2222
ruby-version: '3.0.2'
23-
- name: Enable bundler cache
24-
uses: actions/cache@v2
25-
with:
26-
path: vendor/bundle
27-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
28-
restore-keys: |
29-
${{ runner.os }}-gems-
23+
bundler-cache: true
3024
- name: Install deps
3125
run: |
32-
gem install bundler
33-
bundle config path vendor/bundle
34-
bundle install --jobs 4 --retry 3
3526
npm install -g mermaid.cli
3627
- name: Setup deploy options
3728
id: setup

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Feel free to add your own page(s) by sending a PR.
6868
<a href="https://amalawilson.com" target="_blank">★</a>
6969
<a href="https://tirtharajdash.github.io" target="_blank">★</a>
7070
<a href="https://carolinacarreira.github.io" target="_blank">★</a>
71+
<a href="https://manandey.github.io" target="_blank">★</a>
7172
</td>
7273
</tr>
7374
<tr>

_config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,8 @@ filtered_bibtex_keywords: [abbr, abstract, arxiv, bibtex_show, html, pdf, select
240240
# Responsive WebP Images
241241
# -----------------------------------------------------------------------------
242242

243-
enable_responsive_images: true # enables responsive images for your site (recomended, see https://github.com/alshedivat/al-folio/issues/537)
244-
245243
imagemagick:
246-
enabled: true # make it 'false' if not using responsive images
244+
enabled: true # enables responsive images for your site (recomended, see https://github.com/alshedivat/al-folio/issues/537)
247245
widths:
248246
- 480
249247
- 800

_includes/figure.html

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
1-
{%- assign path = include.path | remove: ".jpg" | remove: ".jpeg" | remove: ".png" | remove: ".tiff" -%}
1+
{%- assign img_path = include.path | remove: ".jpg" | remove: ".jpeg" | remove: ".png" | remove: ".tiff" -%}
22

33
<figure>
44

55
<picture>
6-
{% if site.enable_responsive_images %}
6+
{% if site.imagemagick.enabled %}
77
{% for i in site.imagemagick.widths -%}
8-
<source media="(max-width: {{ i }}px)" srcset="{{ path | relative_url }}-{{ i }}.webp" />
8+
<source
9+
class="responsive-img-srcset"
10+
media="(max-width: {{ i }}px)"
11+
srcset="{{ img_path | relative_url }}-{{ i }}.webp"
12+
/>
913
{% endfor -%}
1014
{% endif %}
1115

1216
<!-- Fallback to the original file -->
1317
<img
14-
{% if include.class %}class="{{ include.class }}"{% endif %}
15-
src="{{ include.path | relative_url }}"
16-
{% if include.width %}width="{{ include.width }}"{% else %}width="auto"{% endif %}
17-
{% if include.height %}height="{{ include.height }}"{% else %}height="auto"{% endif %}
18-
{% if include.min-width %}min-width="{{ include.min-width }}"{% endif %}
19-
{% if include.min-height %}min-height="{{ include.min-height }}"{% endif %}
20-
{% if include.max-width %}max-width="{{ include.max-width }}"{% endif %}
21-
{% if include.max-height %}height="{{ include.max-height }}"{% endif %}
22-
{% if include.alt %}alt="{{ include.alt }}"{% endif %}
23-
{% if include.title %}title="{{ include.title }}"{% endif %}
24-
{% if include.zoomable %}data-zoomable{% endif %} />
18+
src="{{ include.path | relative_url }}"
19+
{% if include.class %}class="{{ include.class }}"{% endif %}
20+
{% if include.width %}width="{{ include.width }}"{% else %}width="auto"{% endif %}
21+
{% if include.height %}height="{{ include.height }}"{% else %}height="auto"{% endif %}
22+
{% if include.min-width %}min-width="{{ include.min-width }}"{% endif %}
23+
{% if include.min-height %}min-height="{{ include.min-height }}"{% endif %}
24+
{% if include.max-width %}max-width="{{ include.max-width }}"{% endif %}
25+
{% if include.max-height %}height="{{ include.max-height }}"{% endif %}
26+
{% if include.alt %}alt="{{ include.alt }}"{% endif %}
27+
{% if include.title %}title="{{ include.title }}"{% endif %}
28+
{% if include.zoomable %}data-zoomable{% endif %}
29+
onerror="this.onerror=null; $('.responsive-img-srcset').remove();"
30+
/>
2531

2632
</picture>
2733

_layouts/about.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ <h1 class="post-title">
1818
{%- assign profile_image_path = page.profile.image | prepend: 'assets/img/' -%}
1919

2020
{% if page.profile.image_cicular %}
21-
{%- assign profile_image_class = "img-fluid z-dept-1 rounded-circle" -%}
21+
{%- assign profile_image_class = "img-fluid z-depth-1 rounded-circle" -%}
2222
{% else %}
23-
{%- assign profile_image_class = "img-fluid z-dept-1 rounded" -%}
23+
{%- assign profile_image_class = "img-fluid z-depth-1 rounded" -%}
2424
{% endif %}
2525

2626
{% include figure.html

0 commit comments

Comments
 (0)