Broken merge
This commit is contained in:
parent
0b852e1d52
commit
d73cb66f67
18
Gemfile.lock
18
Gemfile.lock
@ -165,6 +165,9 @@ GEM
|
|||||||
terser (~> 1.2.3)
|
terser (~> 1.2.3)
|
||||||
jekyll-paginate-v2 (3.0.0)
|
jekyll-paginate-v2 (3.0.0)
|
||||||
jekyll (>= 3.0, < 5.0)
|
jekyll (>= 3.0, < 5.0)
|
||||||
|
jekyll-pandoc (2.0.1)
|
||||||
|
jekyll (>= 3.0)
|
||||||
|
pandoc-ruby (~> 2.0, >= 2.0.0)
|
||||||
jekyll-regex-replace (1.1.0)
|
jekyll-regex-replace (1.1.0)
|
||||||
jekyll-sass-converter (3.1.0)
|
jekyll-sass-converter (3.1.0)
|
||||||
sass-embedded (~> 1.75)
|
sass-embedded (~> 1.75)
|
||||||
@ -197,6 +200,13 @@ GEM
|
|||||||
kramdown-parser-gfm (1.1.0)
|
kramdown-parser-gfm (1.1.0)
|
||||||
kramdown (~> 2.0)
|
kramdown (~> 2.0)
|
||||||
latex-decode (0.4.2)
|
latex-decode (0.4.2)
|
||||||
|
libv8-node (24.12.0.1)
|
||||||
|
libv8-node (24.12.0.1-aarch64-linux)
|
||||||
|
libv8-node (24.12.0.1-aarch64-linux-musl)
|
||||||
|
libv8-node (24.12.0.1-arm64-darwin)
|
||||||
|
libv8-node (24.12.0.1-x86_64-darwin)
|
||||||
|
libv8-node (24.12.0.1-x86_64-linux)
|
||||||
|
libv8-node (24.12.0.1-x86_64-linux-musl)
|
||||||
liquid (4.0.4)
|
liquid (4.0.4)
|
||||||
listen (3.10.0)
|
listen (3.10.0)
|
||||||
logger
|
logger
|
||||||
@ -209,6 +219,8 @@ GEM
|
|||||||
matrix (0.4.3)
|
matrix (0.4.3)
|
||||||
mercenary (0.4.0)
|
mercenary (0.4.0)
|
||||||
mini_mime (1.1.5)
|
mini_mime (1.1.5)
|
||||||
|
mini_racer (0.19.2)
|
||||||
|
libv8-node (~> 24.12.0.1)
|
||||||
minitest (6.0.1)
|
minitest (6.0.1)
|
||||||
prism (~> 1.5)
|
prism (~> 1.5)
|
||||||
multi_xml (0.8.1)
|
multi_xml (0.8.1)
|
||||||
@ -237,6 +249,7 @@ GEM
|
|||||||
time
|
time
|
||||||
uri
|
uri
|
||||||
ostruct (0.6.3)
|
ostruct (0.6.3)
|
||||||
|
pandoc-ruby (2.1.10)
|
||||||
pathutil (0.16.2)
|
pathutil (0.16.2)
|
||||||
forwardable-extended (~> 2.6)
|
forwardable-extended (~> 2.6)
|
||||||
prism (1.8.0)
|
prism (1.8.0)
|
||||||
@ -279,6 +292,7 @@ GEM
|
|||||||
tzinfo (2.0.6)
|
tzinfo (2.0.6)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
unicode-display_width (2.6.0)
|
unicode-display_width (2.6.0)
|
||||||
|
unicode_utils (1.4.0)
|
||||||
uri (1.1.1)
|
uri (1.1.1)
|
||||||
webrick (1.9.2)
|
webrick (1.9.2)
|
||||||
|
|
||||||
@ -313,6 +327,7 @@ DEPENDENCIES
|
|||||||
jekyll-link-attributes
|
jekyll-link-attributes
|
||||||
jekyll-minifier
|
jekyll-minifier
|
||||||
jekyll-paginate-v2
|
jekyll-paginate-v2
|
||||||
|
jekyll-pandoc
|
||||||
jekyll-regex-replace
|
jekyll-regex-replace
|
||||||
jekyll-scholar
|
jekyll-scholar
|
||||||
jekyll-sitemap
|
jekyll-sitemap
|
||||||
@ -322,8 +337,11 @@ DEPENDENCIES
|
|||||||
jekyll-toc
|
jekyll-toc
|
||||||
jekyll-twitter-plugin
|
jekyll-twitter-plugin
|
||||||
jemoji
|
jemoji
|
||||||
|
mini_racer
|
||||||
observer
|
observer
|
||||||
ostruct
|
ostruct
|
||||||
|
unicode_utils
|
||||||
|
webrick
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
4.0.4
|
4.0.4
|
||||||
|
|||||||
@ -5,7 +5,8 @@
|
|||||||
## Setup and develop
|
## Setup and develop
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bundle
|
bundle config set path 'vendor/bundle'
|
||||||
|
bundle install
|
||||||
bundle exec jekyll serve --livereload
|
bundle exec jekyll serve --livereload
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
36
_includes/figure.html
Normal file
36
_includes/figure.html
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
{%- assign img_path = include.path | remove: ".jpg" | remove: ".jpeg" | remove: ".png" | remove: ".tiff" -%}
|
||||||
|
|
||||||
|
<figure>
|
||||||
|
|
||||||
|
<picture>
|
||||||
|
{% if site.imagemagick.enabled %}
|
||||||
|
{% for i in site.imagemagick.widths -%}
|
||||||
|
<source
|
||||||
|
class="responsive-img-srcset"
|
||||||
|
media="(max-width: {{ i }}px)"
|
||||||
|
srcset="{{ img_path | relative_url }}-{{ i }}.webp"
|
||||||
|
/>
|
||||||
|
{% endfor -%}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<!-- Fallback to the original file -->
|
||||||
|
<img
|
||||||
|
src="{{ include.path | relative_url }}"
|
||||||
|
{% if include.class %}class="{{ include.class }}"{% endif %}
|
||||||
|
{% if include.width %}width="{{ include.width }}"{% else %}width="auto"{% endif %}
|
||||||
|
{% if include.height %}height="{{ include.height }}"{% else %}height="auto"{% endif %}
|
||||||
|
{% if include.min-width %}min-width="{{ include.min-width }}"{% endif %}
|
||||||
|
{% if include.min-height %}min-height="{{ include.min-height }}"{% endif %}
|
||||||
|
{% if include.max-width %}max-width="{{ include.max-width }}"{% endif %}
|
||||||
|
{% if include.max-height %}height="{{ include.max-height }}"{% endif %}
|
||||||
|
{% if include.alt %}alt="{{ include.alt }}"{% endif %}
|
||||||
|
{% if include.title %}title="{{ include.title }}"{% endif %}
|
||||||
|
{% if include.zoomable %}data-zoomable{% endif %}
|
||||||
|
onerror="this.onerror=null; $('.responsive-img-srcset').remove();"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</picture>
|
||||||
|
|
||||||
|
{%- if include.caption -%}<figcaption class="caption">{{ include.caption }}</figcaption>{%- endif %}
|
||||||
|
|
||||||
|
</figure>
|
||||||
Loading…
Reference in New Issue
Block a user