From 1b4710824f18aa4f84e5a93d56a1549fa9e84d64 Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 27 Nov 2019 14:51:08 +0100 Subject: [PATCH 1/7] Update dependencies --- Gemfile.lock | 105 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 43 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f1476ae..038e067 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - adsf (1.4.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + adsf (1.4.2) rack (>= 1.0.0, < 3.0.0) - autoprefixer-rails (8.5.0) + autoprefixer-rails (9.7.2) execjs builder (3.2.3) coderay (1.1.2) @@ -14,18 +14,19 @@ GEM execjs coffee-script-source (1.12.2) colored (1.2) - concurrent-ruby (1.0.5) - cri (2.15.1) - colored (~> 1.2) + concurrent-ruby (1.1.5) + cri (2.15.9) ddmemoize (1.0.0) ddmetrics (~> 1.0) ref (~> 2.0) ddmetrics (1.0.1) ddplugin (1.0.2) + diff-lcs (1.3) + equatable (0.6.1) execjs (2.7.0) - ffi (1.9.25) + ffi (1.11.3) formatador (0.2.5) - guard (2.14.2) + guard (2.16.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -35,62 +36,74 @@ GEM shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-nanoc (2.1.4) + guard-nanoc (2.1.7) guard (~> 2.8) guard-compat (~> 1.0) - nanoc (>= 4.3.8, < 5.0) + nanoc (>= 4.11.13, < 5.0) hamster (3.0.0) concurrent-ruby (~> 1.0) - highline (1.7.10) + highline (2.0.3) htmlcompressor (0.4.0) - icalendar (2.4.1) - json (2.1.0) - json_schema (0.19.1) - kramdown (1.16.2) + icalendar (2.6.0) + ice_cube (~> 0.16) + ice_cube (0.16.3) + json (2.2.0) + json_schema (0.20.8) + kramdown (2.1.0) libv8 (3.16.14.19) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.2.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) lumberjack (1.0.13) - method_source (0.9.0) - mini_portile2 (2.3.0) - nanoc (4.10.1) + method_source (0.9.2) + mini_portile2 (2.4.0) + nanoc (4.11.14) addressable (~> 2.5) + colored (~> 1.2) + nanoc-cli (= 4.11.14) + nanoc-core (= 4.11.14) + parallel (~> 1.12) + tty-command (~> 0.8) + tty-which (~> 0.4) + nanoc-cli (4.11.14) cri (~> 2.15) + diff-lcs (~> 1.3) + nanoc-core (= 4.11.14) + zeitwerk (~> 2.1) + nanoc-core (4.11.14) ddmemoize (~> 1.0) ddmetrics (~> 1.0) ddplugin (~> 1.0) hamster (~> 3.0) json_schema (~> 0.19) - parallel (~> 1.12) - ref (~> 2.0) slow_enumerator_tools (~> 1.0) tomlrb (~> 1.2) + tty-platform (~> 0.2) + zeitwerk (~> 2.1) nenv (0.3.0) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - notiffany (0.1.1) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) pandoc-ruby (2.0.2) - parallel (1.12.1) - pry (0.11.3) + parallel (1.19.1) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.3) - rack (2.0.5) + public_suffix (4.0.1) + rack (2.0.7) rainpress (1.0.1) - rake (12.3.1) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) ref (2.0.0) - ruby_dep (1.5.0) rubypants (0.7.0) - sassc (2.0.0) - ffi (~> 1.9.6) - rake + sassc (2.2.1) + ffi (~> 1.9) shellany (0.0.1) slow_enumerator_tools (1.1.0) terminal-notifier (2.0.0) @@ -98,17 +111,23 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.20.0) - tomlrb (1.2.7) + thor (0.20.3) + tomlrb (1.2.9) + tty-color (0.5.0) + tty-command (0.9.0) + pastel (~> 0.7.0) + tty-platform (0.2.1) + tty-which (0.4.1) typogruby (1.0.18) rubypants - uglifier (4.1.10) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - w3c_validators (1.3.3) + w3c_validators (1.3.4) json (>= 1.8) nokogiri (~> 1.6) words_counted (1.0.2) yui-compressor (0.12.0) + zeitwerk (2.2.1) PLATFORMS ruby From d2436a092480031a8e9852223ae3890304c509f2 Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 27 Nov 2019 14:54:35 +0100 Subject: [PATCH 2/7] Remove support coffeescript This is no longer used since #298 --- .codeclimate.yml | 3 --- Gemfile | 3 +-- Gemfile.lock | 5 ----- Rules | 6 ------ 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 660221e..3341f8a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,14 +1,11 @@ engines: bundler-audit: enabled: true - coffeelint: - enabled: true duplication: enabled: true config: languages: - ruby: - - coffeescript: eslint: enabled: true fixme: diff --git a/Gemfile b/Gemfile index 17fba4f..48deeb8 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,7 @@ source 'https://rubygems.org' gem 'nanoc' -# General filtering -gem 'coffee-script' + gem 'icalendar' # ical files gem 'kramdown' gem 'sassc' diff --git a/Gemfile.lock b/Gemfile.lock index 038e067..812568c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,6 @@ GEM execjs builder (3.2.3) coderay (1.1.2) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) colored (1.2) concurrent-ruby (1.1.5) cri (2.15.9) @@ -136,7 +132,6 @@ DEPENDENCIES adsf autoprefixer-rails builder - coffee-script guard-nanoc highline htmlcompressor diff --git a/Rules b/Rules index 7c6eb3d..47b2aea 100644 --- a/Rules +++ b/Rules @@ -174,12 +174,6 @@ end # # ASSETS # -compile '/assets/scripts/**/*.coffee' do - filter :coffeescript - filter :uglify_js if production? - write ext: 'js' -end - compile '/assets/scripts/**/*.js' do filter :uglify_js, harmony: true if production? end From fd11625e0577e08c07bd64e6aae22582a84bf958 Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 27 Nov 2019 15:26:48 +0100 Subject: [PATCH 3/7] Update bulma --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2be96b6..053232c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "https://github.com/ZeusWPI/zeus.ugent.be", "dependencies": { - "bulma": "0.7.5", + "bulma": "0.8.0", "bulma-divider": "~0.2.0", "bulma-timeline": "^3.0.4" } diff --git a/yarn.lock b/yarn.lock index dab3e01..8e3460e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,7 +12,7 @@ bulma-timeline@^3.0.4: resolved "https://registry.yarnpkg.com/bulma-timeline/-/bulma-timeline-3.0.4.tgz#494f458098a06dcf8dcc7fe8f2f158b63d1d1ef2" integrity sha512-gCUOcSUuzHoeVMkCpLF49j5Z5yl78XQ+KgJcT+1ju5WIGgBgVytRUob/dw5NHAxPLO2rmcvwYNbCJFp7w4WT4Q== -bulma@0.7.5: - version "0.7.5" - resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.5.tgz#35066c37f82c088b68f94450be758fc00a967208" - integrity sha512-cX98TIn0I6sKba/DhW0FBjtaDpxTelU166pf7ICXpCCuplHWyu6C9LYZmL5PEsnePIeJaiorsTEzzNk3Tsm1hw== +bulma@0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.8.0.tgz#ac1606431703a4761b18a4a2d5cc1fa864a2aece" + integrity sha512-nhf3rGyiZh/VM7FrSJ/5KeLlfaFkXz0nYcXriynfPH4vVpnxnqyEwaNGdNCVzHyyCA3cHgkQAMpdF/SFbFGZfA== From b6001a118db81d79ab0c1cf7c52a2347725cb16a Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 27 Nov 2019 15:27:11 +0100 Subject: [PATCH 4/7] Small CSS clean-up --- .../assets/stylesheets/includes/general.scss | 18 ------------------ content/blog/16-17/bestuur.md | 14 +++++++------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index 92da9b4..e75af98 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -81,24 +81,6 @@ footer.footer { align-items: center; } -.imgcenter { - margin: auto; - display: block; -} - -.hydra-tile { - background-color: #1E64C8; -} - -.lana-tile { - background-color: $tile-orange; -} - -.project-tile { - background-color: $turquoise; -} - - // For better centering on mobile @include mobile { #tipue_search_input { diff --git a/content/blog/16-17/bestuur.md b/content/blog/16-17/bestuur.md index 9c5c4cd..155375e 100644 --- a/content/blog/16-17/bestuur.md +++ b/content/blog/16-17/bestuur.md @@ -20,7 +20,7 @@ Favoriete taal : Malbolge Favoriete OS : LFS -![alt text](//media.giphy.com/media/1lop3XEoCngYg/giphy.gif){: .imgcenter } +![alt text](//media.giphy.com/media/1lop3XEoCngYg/giphy.gif){: .image .container } # Isaura Claeys | Vicevoorzitter @@ -36,7 +36,7 @@ Favoriete taal : Isauriaans (//en.wikipedia.org/wiki/Isaurian_language) Favoriete OS : OSX -![alt text](//i.imgur.com/ebvggMn.gif){: .imgcenter } +![alt text](//i.imgur.com/ebvggMn.gif){: .image .container } # Jeroen De Clerck | Penningmeester @@ -52,7 +52,7 @@ Favoriete taal : python Favoriete OS : archlinux -![alt text](//i.imgur.com/5c22RvF.gif){: .imgcenter } +![alt text](//i.imgur.com/5c22RvF.gif){: .image .container } # Eloïse Piret | Eventverantwoordelijke @@ -68,7 +68,7 @@ Favoriete taal : Python Favoriete OS : OS X (pls don't kill me) -![alt text](//media.tenor.co/images/6659f7a4dead984cdcc05903e7c9503f/tenor.gif){: .imgcenter } +![alt text](//media.tenor.co/images/6659f7a4dead984cdcc05903e7c9503f/tenor.gif){: .image .container } # Lorin Werthen | Systeemadministrator @@ -84,7 +84,7 @@ Favoriete taal : Ruby :heart: Favoriete OS : Arch Linux -![alt text](//iruntheinternet.com/lulzdump/images/skateboarder-never-drops-it-keeps-running-runs-away-bye-14344846555.gif){: .imgcenter } +![alt text](//iruntheinternet.com/lulzdump/images/skateboarder-never-drops-it-keeps-running-runs-away-bye-14344846555.gif){: .image .container } # Rien Maertens | Systeemadministrator @@ -100,7 +100,7 @@ Favoriete taal : West-Vlams Favoriete OS : Arch Linux -![alt text](https://i.imgur.com/RGITm8c.gif){: .imgcenter } +![alt text](https://i.imgur.com/RGITm8c.gif){: .image .container } # Feliciaan De Palmenaer | Projectverantwoordelijke @@ -116,4 +116,4 @@ Favoriete taal : Swift Favoriete OS : macOs -![alt text](//emoji.slack-edge.com/T02E8K8GY/zeustux/19b65368560af6c2.jpg){: .imgcenter } +![alt text](//emoji.slack-edge.com/T02E8K8GY/zeustux/19b65368560af6c2.jpg){: .image .container } From f1afa6cd3f822c6a0ac1faed3cd2037d12161bec Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 27 Nov 2019 16:06:47 +0100 Subject: [PATCH 5/7] Update Ruby and pandoc version --- .ruby-version | 2 +- .travis.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index 437459c..57cf282 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.0 +2.6.5 diff --git a/.travis.yml b/.travis.yml index 48252c1..2f8d05e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,13 +26,13 @@ branches: - master rvm: -- 2.5.0 +- 2.6.5 notifications: slack: secure: tej68wbYns4DYg488iz+4ncU3/CHJvG/5c1qntGcEjti6vZp24atuH32BzNMY+gqa5ftZtcRfqIiJ0I0tkbiFWEDzjSk89bgjG4sgwXq1gMqi/Fj4bqEpjU5m7QLa786q4UfYyTF+srca1fHPLVS5REdGjRr2wxX+bcFnTRxreGCIrlNdWhoZPPJyS37R4RR9k+l5ZWZnqWgUN6bD448O8EzMRVRWoUSxQcJ6+u4QLpinEvem4iXe+WcHOyFfsNmavxGGMMpkOSed/tzA1l+gNpl224qOJl3yAk2qrGi4N6SOnSkeJFfUO5RzX56KDC/tcCL1oJpamhDmzDvRrbDNnCjSriv+g+PkXEjiwBF/tkZwIe7nMKyc9QF698Zvdgb6Ffbq21obsRnkkddkxijthdbUKMAIREPQuU7pXRL4ykPkBeB5GkNjPlErOooxvUHvQEVElJ8NMD4ychQqW6relaYJ0W0uy0QMvrtS+cHkpprZAOZzWLa3AdEOvD50kiS2hDhJway5JHJg/LMl3I6XVVMx6fNGdNWBcezeCqkDZM+nuMJqgAtQ+Tz8bwrHLCJgS5u0lQq/MbrDkYdpmmzvA5LXxn2SpjfOAlgiFKnSIwKSuuuwzW/zCEGdPo1pfBba2VfYAN4y1l863j5ph+eMtlHf7JG8mzIWTo3k+Jx8lQ= before_install: -- wget https://github.com/jgm/pandoc/releases/download/2.7.3/pandoc-2.7.3-1-amd64.deb -- sudo dpkg -i pandoc-2.7.3-1-amd64.deb +- wget https://github.com/jgm/pandoc/releases/download/2.8/pandoc-2.8-1-amd64.deb +- sudo dpkg -i pandoc-2.8-1-amd64.deb - openssl aes-256-cbc -K $encrypted_6059a4f451fd_key -iv $encrypted_6059a4f451fd_iv -in id_rsa.enc -out deploy_key -d - mv deploy_key ~/.ssh/id_rsa From 94805880f99d3a279aea3a9030dc76edc7d7b6aa Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 27 Nov 2019 16:28:59 +0100 Subject: [PATCH 6/7] Replace therubyracer with mini_racer --- Gemfile | 2 +- Gemfile.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 48deeb8..2411113 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ end group :production do # Faster css autoprefixing - gem 'therubyracer' + gem 'mini_racer' # Autoprefixing for class gem 'autoprefixer-rails' gem 'htmlcompressor' diff --git a/Gemfile.lock b/Gemfile.lock index 812568c..423a7ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,13 +46,15 @@ GEM json (2.2.0) json_schema (0.20.8) kramdown (2.1.0) - libv8 (3.16.14.19) + libv8 (7.3.492.27.1) listen (3.2.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) lumberjack (1.0.13) method_source (0.9.2) mini_portile2 (2.4.0) + mini_racer (0.2.8) + libv8 (>= 6.9.411) nanoc (4.11.14) addressable (~> 2.5) colored (~> 1.2) @@ -104,9 +106,6 @@ GEM slow_enumerator_tools (1.1.0) terminal-notifier (2.0.0) terminal-notifier-guard (1.7.0) - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref thor (0.20.3) tomlrb (1.2.9) tty-color (0.5.0) @@ -137,13 +136,13 @@ DEPENDENCIES htmlcompressor icalendar kramdown + mini_racer nanoc pandoc-ruby rainpress sassc terminal-notifier terminal-notifier-guard - therubyracer typogruby uglifier (>= 4.0.0) w3c_validators From 3d5f8ae5eae7551db9187da799836ef42ea959ae Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 27 Nov 2019 16:41:11 +0100 Subject: [PATCH 7/7] Remove v8 include --- lib/filters/autoprefixer.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/filters/autoprefixer.rb b/lib/filters/autoprefixer.rb index bbb374e..65abd34 100644 --- a/lib/filters/autoprefixer.rb +++ b/lib/filters/autoprefixer.rb @@ -1,4 +1,3 @@ -require 'v8' require 'autoprefixer-rails' Nanoc::Filter.define(:autoprefixer) do |content, _params|