Skip to content

Commit 2a1c808

Browse files
dfuchssdfuchss
committed
Merge remote-tracking branch 'origin/upstream'
# Conflicts: # INSTALL.md # README.md # _config.yml
2 parents 8a7d325 + 81b3c60 commit 2a1c808

File tree

4 files changed

+57
-53
lines changed

4 files changed

+57
-53
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)
@@ -187,26 +187,26 @@ GEM
187187
matrix (0.4.2)
188188
mercenary (0.4.0)
189189
mini_mime (1.1.5)
190-
minitest (5.25.4)
190+
minitest (5.25.5)
191191
multi_xml (0.7.1)
192192
bigdecimal (~> 3.1)
193193
namae (1.2.0)
194194
racc (~> 1.7)
195-
nokogiri (1.18.3-aarch64-linux-gnu)
195+
nokogiri (1.18.5-aarch64-linux-gnu)
196196
racc (~> 1.4)
197-
nokogiri (1.18.3-aarch64-linux-musl)
197+
nokogiri (1.18.5-aarch64-linux-musl)
198198
racc (~> 1.4)
199-
nokogiri (1.18.3-arm-linux-gnu)
199+
nokogiri (1.18.5-arm-linux-gnu)
200200
racc (~> 1.4)
201-
nokogiri (1.18.3-arm-linux-musl)
201+
nokogiri (1.18.5-arm-linux-musl)
202202
racc (~> 1.4)
203-
nokogiri (1.18.3-arm64-darwin)
203+
nokogiri (1.18.5-arm64-darwin)
204204
racc (~> 1.4)
205-
nokogiri (1.18.3-x86_64-darwin)
205+
nokogiri (1.18.5-x86_64-darwin)
206206
racc (~> 1.4)
207-
nokogiri (1.18.3-x86_64-linux-gnu)
207+
nokogiri (1.18.5-x86_64-linux-gnu)
208208
racc (~> 1.4)
209-
nokogiri (1.18.3-x86_64-linux-musl)
209+
nokogiri (1.18.5-x86_64-linux-musl)
210210
racc (~> 1.4)
211211
observer (0.1.2)
212212
open-uri (0.5.0)
@@ -225,22 +225,22 @@ GEM
225225
rexml (3.4.1)
226226
rouge (4.5.1)
227227
safe_yaml (1.0.5)
228-
sass-embedded (1.85.1-aarch64-linux-gnu)
229-
google-protobuf (~> 4.29)
230-
sass-embedded (1.85.1-aarch64-linux-musl)
231-
google-protobuf (~> 4.29)
232-
sass-embedded (1.85.1-arm-linux-gnueabihf)
233-
google-protobuf (~> 4.29)
234-
sass-embedded (1.85.1-arm-linux-musleabihf)
235-
google-protobuf (~> 4.29)
236-
sass-embedded (1.85.1-arm64-darwin)
237-
google-protobuf (~> 4.29)
238-
sass-embedded (1.85.1-x86_64-darwin)
239-
google-protobuf (~> 4.29)
240-
sass-embedded (1.85.1-x86_64-linux-gnu)
241-
google-protobuf (~> 4.29)
242-
sass-embedded (1.85.1-x86_64-linux-musl)
243-
google-protobuf (~> 4.29)
228+
sass-embedded (1.86.0-aarch64-linux-gnu)
229+
google-protobuf (~> 4.30)
230+
sass-embedded (1.86.0-aarch64-linux-musl)
231+
google-protobuf (~> 4.30)
232+
sass-embedded (1.86.0-arm-linux-gnueabihf)
233+
google-protobuf (~> 4.30)
234+
sass-embedded (1.86.0-arm-linux-musleabihf)
235+
google-protobuf (~> 4.30)
236+
sass-embedded (1.86.0-arm64-darwin)
237+
google-protobuf (~> 4.30)
238+
sass-embedded (1.86.0-x86_64-darwin)
239+
google-protobuf (~> 4.30)
240+
sass-embedded (1.86.0-x86_64-linux-gnu)
241+
google-protobuf (~> 4.30)
242+
sass-embedded (1.86.0-x86_64-linux-musl)
243+
google-protobuf (~> 4.30)
244244
sax-machine (1.3.2)
245245
securerandom (0.4.1)
246246
stringio (3.1.5)
@@ -299,4 +299,4 @@ DEPENDENCIES
299299
ostruct
300300

301301
BUNDLED WITH
302-
2.6.5
302+
2.6.6

‎_config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ rss_icon: false
5050

5151
navbar_fixed: true
5252
footer_fixed: true
53+
5354
search_enabled: false
5455
socials_in_search: false
56+
posts_in_search: false
5557
bib_search: false
5658

5759
# Dimensions

‎_scripts/search.liquid.js‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,30 +52,32 @@ ninja.data = [
5252
{%- endif -%}
5353
{%- endif -%}
5454
{%- endfor -%}
55-
{%- for post in site.posts -%}
56-
{
57-
{%- assign title = post.title | escape | strip -%}
58-
id: "post-{{ title | slugify }}",
59-
{% if post.redirect == blank %}
60-
title: "{{ title | truncatewords: 13 }}",
61-
{% elsif post.redirect contains '://' %}
62-
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>',
63-
{% else %}
64-
title: "{{ title | truncatewords: 13 }}",
65-
{% endif %}
66-
description: "{{ post.description | strip_html | strip_newlines | escape | strip }}",
67-
section: "Posts",
68-
handler: () => {
55+
{%- if site.posts_in_search -%}
56+
{%- for post in site.posts -%}
57+
{
58+
{%- assign title = post.title | escape | strip -%}
59+
id: "post-{{ title | slugify }}",
6960
{% if post.redirect == blank %}
70-
window.location.href = "{{ post.url | relative_url }}";
61+
title: "{{ title | truncatewords: 13 }}",
7162
{% elsif post.redirect contains '://' %}
72-
window.open("{{ post.redirect }}", "_blank");
63+
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>',
7364
{% else %}
74-
window.location.href = "{{ post.redirect | relative_url }}";
65+
title: "{{ title | truncatewords: 13 }}",
7566
{% endif %}
67+
description: "{{ post.description | strip_html | strip_newlines | escape | strip }}",
68+
section: "Posts",
69+
handler: () => {
70+
{% if post.redirect == blank %}
71+
window.location.href = "{{ post.url | relative_url }}";
72+
{% elsif post.redirect contains '://' %}
73+
window.open("{{ post.redirect }}", "_blank");
74+
{% else %}
75+
window.location.href = "{{ post.redirect | relative_url }}";
76+
{% endif %}
77+
},
7678
},
77-
},
78-
{%- endfor -%}
79+
{%- endfor -%}
80+
{%- endif -%}
7981
{%- for collection in site.collections -%}
8082
{%- if collection.label != 'posts' -%}
8183
{%- 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: amirpourmand/al-folio:v0.14.3
4+
image: amirpourmand/al-folio:v0.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)