Skip to content

Commit 159ef17

Browse files
committed
Merge branch 'al-folio-main'
2 parents 3abdf17 + 81b3c60 commit 159ef17

File tree

6 files changed

+59
-55
lines changed

6 files changed

+59
-55
lines changed

Gemfile.lock

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
activesupport (8.0.1)
12+
activesupport (8.0.2)
1313
base64
1414
benchmark (>= 0.3)
1515
bigdecimal
@@ -55,7 +55,7 @@ GEM
5555
css_parser (1.21.1)
5656
addressable
5757
cssminify2 (2.0.1)
58-
csv (3.3.2)
58+
csv (3.3.3)
5959
date (3.4.1)
6060
deep_merge (1.2.2)
6161
drb (2.2.1)
@@ -79,19 +79,19 @@ GEM
7979
forwardable (1.3.3)
8080
forwardable-extended (2.6.0)
8181
gemoji (4.1.0)
82-
google-protobuf (4.30.0)
82+
google-protobuf (4.30.1)
8383
bigdecimal
8484
rake (>= 13)
85-
google-protobuf (4.30.0-aarch64-linux)
85+
google-protobuf (4.30.1-aarch64-linux)
8686
bigdecimal
8787
rake (>= 13)
88-
google-protobuf (4.30.0-arm64-darwin)
88+
google-protobuf (4.30.1-arm64-darwin)
8989
bigdecimal
9090
rake (>= 13)
91-
google-protobuf (4.30.0-x86_64-darwin)
91+
google-protobuf (4.30.1-x86_64-darwin)
9292
bigdecimal
9393
rake (>= 13)
94-
google-protobuf (4.30.0-x86_64-linux)
94+
google-protobuf (4.30.1-x86_64-linux)
9595
bigdecimal
9696
rake (>= 13)
9797
html-pipeline (2.14.3)
@@ -189,26 +189,26 @@ GEM
189189
matrix (0.4.2)
190190
mercenary (0.4.0)
191191
mini_mime (1.1.5)
192-
minitest (5.25.4)
192+
minitest (5.25.5)
193193
multi_xml (0.7.1)
194194
bigdecimal (~> 3.1)
195195
namae (1.2.0)
196196
racc (~> 1.7)
197-
nokogiri (1.18.3-aarch64-linux-gnu)
197+
nokogiri (1.18.5-aarch64-linux-gnu)
198198
racc (~> 1.4)
199-
nokogiri (1.18.3-aarch64-linux-musl)
199+
nokogiri (1.18.5-aarch64-linux-musl)
200200
racc (~> 1.4)
201-
nokogiri (1.18.3-arm-linux-gnu)
201+
nokogiri (1.18.5-arm-linux-gnu)
202202
racc (~> 1.4)
203-
nokogiri (1.18.3-arm-linux-musl)
203+
nokogiri (1.18.5-arm-linux-musl)
204204
racc (~> 1.4)
205-
nokogiri (1.18.3-arm64-darwin)
205+
nokogiri (1.18.5-arm64-darwin)
206206
racc (~> 1.4)
207-
nokogiri (1.18.3-x86_64-darwin)
207+
nokogiri (1.18.5-x86_64-darwin)
208208
racc (~> 1.4)
209-
nokogiri (1.18.3-x86_64-linux-gnu)
209+
nokogiri (1.18.5-x86_64-linux-gnu)
210210
racc (~> 1.4)
211-
nokogiri (1.18.3-x86_64-linux-musl)
211+
nokogiri (1.18.5-x86_64-linux-musl)
212212
racc (~> 1.4)
213213
observer (0.1.2)
214214
open-uri (0.5.0)
@@ -227,22 +227,22 @@ GEM
227227
rexml (3.4.1)
228228
rouge (4.5.1)
229229
safe_yaml (1.0.5)
230-
sass-embedded (1.85.1-aarch64-linux-gnu)
231-
google-protobuf (~> 4.29)
232-
sass-embedded (1.85.1-aarch64-linux-musl)
233-
google-protobuf (~> 4.29)
234-
sass-embedded (1.85.1-arm-linux-gnueabihf)
235-
google-protobuf (~> 4.29)
236-
sass-embedded (1.85.1-arm-linux-musleabihf)
237-
google-protobuf (~> 4.29)
238-
sass-embedded (1.85.1-arm64-darwin)
239-
google-protobuf (~> 4.29)
240-
sass-embedded (1.85.1-x86_64-darwin)
241-
google-protobuf (~> 4.29)
242-
sass-embedded (1.85.1-x86_64-linux-gnu)
243-
google-protobuf (~> 4.29)
244-
sass-embedded (1.85.1-x86_64-linux-musl)
245-
google-protobuf (~> 4.29)
230+
sass-embedded (1.86.0-aarch64-linux-gnu)
231+
google-protobuf (~> 4.30)
232+
sass-embedded (1.86.0-aarch64-linux-musl)
233+
google-protobuf (~> 4.30)
234+
sass-embedded (1.86.0-arm-linux-gnueabihf)
235+
google-protobuf (~> 4.30)
236+
sass-embedded (1.86.0-arm-linux-musleabihf)
237+
google-protobuf (~> 4.30)
238+
sass-embedded (1.86.0-arm64-darwin)
239+
google-protobuf (~> 4.30)
240+
sass-embedded (1.86.0-x86_64-darwin)
241+
google-protobuf (~> 4.30)
242+
sass-embedded (1.86.0-x86_64-linux-gnu)
243+
google-protobuf (~> 4.30)
244+
sass-embedded (1.86.0-x86_64-linux-musl)
245+
google-protobuf (~> 4.30)
246246
sax-machine (1.3.2)
247247
securerandom (0.4.1)
248248
stringio (3.1.5)
@@ -302,4 +302,4 @@ DEPENDENCIES
302302
ostruct
303303

304304
BUNDLED WITH
305-
2.6.5
305+
2.6.6

INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@ If you installed **multi-language-al-folio** as described above, you can manuall
240240

241241
```bash
242242
# Assuming the current directory is <your-repo-name>
243-
$ git remote add upstream https://github.com/george-gca/multi-language-al-folio.git
243+
$ git remote add upstream https://github.com/alshedivat/al-folio.git
244244
$ git fetch upstream
245-
$ git rebase v1.14.3
245+
$ git rebase v1.14.4
246246
```
247247

248248
If you have extensively customized a previous version, it might be trickier to upgrade.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ Feel free to add your own page(s) by sending a PR.
161161
<a href="https://jpfonseca.github.io/" target="_blank">★</a>
162162
<a href="https://dmitryryumin.github.io/" target="_blank">★</a>
163163
<a href="https://alexiglad.github.io/" target="_blank">★</a>
164+
<a href="https://nishanthjkumar.com/" target="_blank">★</a>
164165
</td>
165166
</tr>
166167
<tr>

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ navbar_fixed: true
4343
footer_fixed: true
4444
search_enabled: true
4545
socials_in_search: true
46+
posts_in_search: true
4647
bib_search: true
4748

4849
# Dimensions

_scripts/search.liquid.js

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,32 @@ ninja.data = [
6666
{%- endif -%}
6767
{%- endif -%}
6868
{%- endfor -%}
69-
{%- for post in site.posts -%}
70-
{
71-
{%- assign title = post.title | escape | strip -%}
72-
id: "post-{{ title | slugify }}",
73-
{% if post.redirect == blank %}
74-
title: "{{ title | truncatewords: 13 }}",
75-
{% elsif post.redirect contains '://' %}
76-
title: '{{ title | truncatewords: 13 }} <svg width="1.2rem" height="1.2rem" top=".5rem" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg"><path d="M17 13.5v6H5v-12h6m3-3h6v6m0-6-9 9" class="icon_svg-stroke" stroke="#999" stroke-width="1.5" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"></path></svg>',
77-
{% else %}
78-
title: "{{ title | truncatewords: 13 }}",
79-
{% endif %}
80-
description: "{{ post.description | strip_html | strip_newlines | escape | strip }}",
81-
section: "{{ site.data[site.active_lang].strings.search.posts }}",
82-
handler: () => {
69+
{%- if site.posts_in_search -%}
70+
{%- for post in site.posts -%}
71+
{
72+
{%- assign title = post.title | escape | strip -%}
73+
id: "post-{{ title | slugify }}",
8374
{% if post.redirect == blank %}
84-
window.location.href = "{{ post.url | prepend: lang | relative_url }}";
75+
title: "{{ title | truncatewords: 13 }}",
8576
{% elsif post.redirect contains '://' %}
86-
window.open("{{ post.redirect }}", "_blank");
77+
title: '{{ title | truncatewords: 13 }} <svg width="1.2rem" height="1.2rem" top=".5rem" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg"><path d="M17 13.5v6H5v-12h6m3-3h6v6m0-6-9 9" class="icon_svg-stroke" stroke="#999" stroke-width="1.5" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"></path></svg>',
8778
{% else %}
88-
window.location.href = "{{ post.redirect | prepend: lang | relative_url }}";
79+
title: "{{ title | truncatewords: 13 }}",
8980
{% endif %}
81+
description: "{{ post.description | strip_html | strip_newlines | escape | strip }}",
82+
section: "{{ site.data[site.active_lang].strings.search.posts }}",
83+
handler: () => {
84+
{% if post.redirect == blank %}
85+
window.location.href = "{{ post.url | prepend: lang | relative_url }}";
86+
{% elsif post.redirect contains '://' %}
87+
window.open("{{ post.redirect }}", "_blank");
88+
{% else %}
89+
window.location.href = "{{ post.redirect | prepend: lang | relative_url }}";
90+
{% endif %}
91+
},
9092
},
91-
},
92-
{%- endfor -%}
93+
{%- endfor -%}
94+
{%- endif -%}
9395
{%- for collection in site.collections -%}
9496
{%- if collection.label != 'posts' -%}
9597
{%- for item in collection.docs -%}

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# this file uses prebuilt image in dockerhub
22
services:
33
jekyll:
4-
image: georgegca/multi-language-al-folio:v1.14.3
4+
image: georgegca/multi-language-al-folio:v1.14.4
55
build: .
66
# uncomment these if you are having this issue with the build:
77
# /usr/local/bundle/gems/jekyll-4.3.4/lib/jekyll/site.rb:509:in `initialize': Permission denied @ rb_sysopen - /srv/jekyll/.jekyll-cache/.gitignore (Errno::EACCES)

0 commit comments

Comments
 (0)