Skip to content

Commit 91ff4a6

Browse files
committed
Merge branch 'al-folio-main'
2 parents 736bb0d + 0dbab21 commit 91ff4a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1427
-1334
lines changed

.github/workflows/axe.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
}
4444
- name: Install and Build 🔧
4545
run: |
46+
sudo apt-get update && sudo apt-get install -y imagemagick
4647
pip3 install --upgrade jupyter
4748
export JEKYLL_ENV=production
4849
bundle exec jekyll build

.github/workflows/broken-links-site.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
}
3232
- name: Install and Build 🔧
3333
run: |
34+
sudo apt-get update && sudo apt-get install -y imagemagick
3435
pip3 install --upgrade jupyter
3536
export JEKYLL_ENV=production
3637
bundle exec jekyll build

.github/workflows/deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ jobs:
8686
value: ${{ github.repository }}
8787
- name: Install and Build 🔧
8888
run: |
89+
sudo apt-get update && sudo apt-get install -y imagemagick
8990
pip3 install --upgrade nbconvert
9091
export JEKYLL_ENV=production
9192
bundle exec jekyll build

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
**/*.min.css
33
**/*.min.js
44
assets/css/main.scss
5-
assets/js/search-data.js
65
assets/js/distillpub/template.v2.js
76
assets/js/search/*.js
87
assets/plotly/demo.html
@@ -11,3 +10,4 @@ _posts/en-us/2015-10-20-math.md
1110
_posts/pt-br/2015-10-20-math.md
1211
_sass/font-awesome/*.scss
1312
_sass/tabler-icons/*.scss
13+
_scripts/search.liquid.js

CUSTOMIZE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ The project is structured as follows, focusing on the main components that you w
2020
│ ├── 📂 LANG/: data for the LANG version. Must have one for each language defined in _config.yml
2121
│   │ ├── 📄 cv.yml: CV in YAML format, used when assets/json/resume_LANG.json is not found
2222
| | └── 📄 strings.yml: localized variables (placeholders). Must have one for each language defined in _config.yml
23-
│   └── 📄 repositories.yml: users and repositories info in YAML format
23+
│   ├── 📄 repositories.yml: users and repositories info in YAML format
24+
│   └── 📄 socials.yml: your social media and contact info in YAML format
2425
├── 📂 _includes/: contains code parts that are included in the main HTML file
2526
│   └── 📄 news.liquid: defines the news section layout in the about page
2627
├── 📂 _layouts/: contains the layouts to choose from in the frontmatter of the Markdown files

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ group :jekyll_plugins do
1919
gem 'jekyll-toc'
2020
gem 'jekyll-twitter-plugin'
2121
gem 'jemoji'
22+
gem 'terser'
2223
gem 'unicode_utils'
2324
gem 'webrick'
2425
end

Gemfile.lock

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (8.0.0.1)
4+
activesupport (8.0.1)
55
base64
66
benchmark (>= 0.3)
77
bigdecimal
@@ -39,7 +39,7 @@ GEM
3939
rexml
4040
csl-styles (1.0.1.11)
4141
csl (~> 1.0)
42-
css_parser (1.19.1)
42+
css_parser (1.21.0)
4343
addressable
4444
cssminify2 (2.0.1)
4545
csv (3.3.0)
@@ -168,7 +168,7 @@ GEM
168168
listen (3.9.0)
169169
rb-fsevent (~> 0.10, >= 0.10.3)
170170
rb-inotify (~> 0.9, >= 0.9.10)
171-
logger (1.6.2)
171+
logger (1.6.3)
172172
loofah (2.23.1)
173173
crass (~> 1.0.2)
174174
nokogiri (>= 1.12.0)
@@ -180,17 +180,17 @@ GEM
180180
bigdecimal (~> 3.1)
181181
namae (1.2.0)
182182
racc (~> 1.7)
183-
nokogiri (1.17.1-aarch64-linux)
183+
nokogiri (1.17.2-aarch64-linux)
184184
racc (~> 1.4)
185-
nokogiri (1.17.1-arm-linux)
185+
nokogiri (1.17.2-arm-linux)
186186
racc (~> 1.4)
187-
nokogiri (1.17.1-arm64-darwin)
187+
nokogiri (1.17.2-arm64-darwin)
188188
racc (~> 1.4)
189-
nokogiri (1.17.1-x86-linux)
189+
nokogiri (1.17.2-x86-linux)
190190
racc (~> 1.4)
191-
nokogiri (1.17.1-x86_64-darwin)
191+
nokogiri (1.17.2-x86_64-darwin)
192192
racc (~> 1.4)
193-
nokogiri (1.17.1-x86_64-linux)
193+
nokogiri (1.17.2-x86_64-linux)
194194
racc (~> 1.4)
195195
pathutil (0.16.2)
196196
forwardable-extended (~> 2.6)
@@ -203,30 +203,32 @@ GEM
203203
rexml (3.3.9)
204204
rouge (4.5.1)
205205
safe_yaml (1.0.5)
206-
sass-embedded (1.82.0-aarch64-linux-gnu)
206+
sass-embedded (1.83.0-aarch64-linux-gnu)
207207
google-protobuf (~> 4.28)
208-
sass-embedded (1.82.0-aarch64-linux-musl)
208+
sass-embedded (1.83.0-aarch64-linux-musl)
209209
google-protobuf (~> 4.28)
210-
sass-embedded (1.82.0-arm-linux-gnueabihf)
210+
sass-embedded (1.83.0-arm-linux-gnueabihf)
211211
google-protobuf (~> 4.28)
212-
sass-embedded (1.82.0-arm-linux-musleabihf)
212+
sass-embedded (1.83.0-arm-linux-musleabihf)
213213
google-protobuf (~> 4.28)
214-
sass-embedded (1.82.0-arm64-darwin)
214+
sass-embedded (1.83.0-arm64-darwin)
215215
google-protobuf (~> 4.28)
216-
sass-embedded (1.82.0-x86-linux-gnu)
216+
sass-embedded (1.83.0-x86-linux-gnu)
217217
google-protobuf (~> 4.28)
218-
sass-embedded (1.82.0-x86-linux-musl)
218+
sass-embedded (1.83.0-x86-linux-musl)
219219
google-protobuf (~> 4.28)
220-
sass-embedded (1.82.0-x86_64-darwin)
220+
sass-embedded (1.83.0-x86_64-darwin)
221221
google-protobuf (~> 4.28)
222-
sass-embedded (1.82.0-x86_64-linux-gnu)
222+
sass-embedded (1.83.0-x86_64-linux-gnu)
223223
google-protobuf (~> 4.28)
224-
sass-embedded (1.82.0-x86_64-linux-musl)
224+
sass-embedded (1.83.0-x86_64-linux-musl)
225225
google-protobuf (~> 4.28)
226226
sax-machine (1.3.2)
227227
securerandom (0.4.0)
228228
terminal-table (3.0.2)
229229
unicode-display_width (>= 1.1.1, < 3)
230+
terser (1.2.4)
231+
execjs (>= 0.3.0, < 3)
230232
tzinfo (2.0.6)
231233
concurrent-ruby (~> 1.0)
232234
uglifier (4.2.1)
@@ -250,6 +252,7 @@ PLATFORMS
250252
x86-linux-gnu
251253
x86-linux-musl
252254
x86_64-darwin
255+
x86_64-linux
253256
x86_64-linux-gnu
254257
x86_64-linux-musl
255258

@@ -276,8 +279,9 @@ DEPENDENCIES
276279
jekyll-toc
277280
jekyll-twitter-plugin
278281
jemoji
282+
terser
279283
unicode_utils
280284
webrick
281285

282286
BUNDLED WITH
283-
2.5.18
287+
2.5.7

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ If you installed **multi-language-al-folio** as described above, you can manuall
210210
# Assuming the current directory is <your-repo-name>
211211
$ git remote add upstream https://github.com/george-gca/multi-language-al-folio.git
212212
$ git fetch upstream
213-
$ git rebase v0.11.0
213+
$ git rebase v0.13.1
214214
```
215215

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

_config.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ kramdown:
170170
start_line: 1
171171

172172
# Includes & excludes
173-
include: ["_pages"]
173+
include: ["_pages", "_scripts"]
174174
exclude:
175175
- bin/
176176
- CONTRIBUTING.md
@@ -216,6 +216,7 @@ plugins:
216216
- jekyll-toc
217217
- jekyll-twitter-plugin
218218
- jemoji
219+
- terser
219220

220221
# Sitemap settings
221222
defaults:
@@ -233,9 +234,16 @@ sass:
233234
# -----------------------------------------------------------------------------
234235

235236
jekyll-minifier:
236-
exclude: ["robots.txt", "assets/js/search/*.js", "assets/libs/**/*"]
237-
uglifier_args:
238-
harmony: true
237+
compress_javascript: false # set to false since we are using terser as the js minifier
238+
# exclude: ["robots.txt", "assets/js/search/*.js"]
239+
240+
# -----------------------------------------------------------------------------
241+
# Terser
242+
# -----------------------------------------------------------------------------
243+
244+
terser:
245+
compress:
246+
drop_console: true
239247

240248
# -----------------------------------------------------------------------------
241249
# Jekyll Archives

0 commit comments

Comments
 (0)