summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Nikolai Viessmann2017-12-26 20:48:36 +0100
committerHans-Nikolai Viessmann2017-12-26 20:48:36 +0100
commitc371be02128b4a3ab4b070db76c460c1bf556a77 (patch)
treeb75587f7e63ab7bbe10269b5ff3451fb2a9b367c
parent074630700679c83374a4491dd2f7cec3f70d74e7 (diff)
downloadblog-c371be02128b4a3ab4b070db76c460c1bf556a77.tar.gz
blog-c371be02128b4a3ab4b070db76c460c1bf556a77.zip
Updated to latest Jekyll
Also moved to using newest assets plugin. Fixed a few minor problems.
-rw-r--r--.gitlab-ci.yml27
-rw-r--r--Gemfile.lock93
-rw-r--r--_assets/css/main.css.scss (renamed from _assets/stylesheets/main.css.scss)0
-rw-r--r--_assets/css/main.old.css.erb (renamed from _assets/stylesheets/main.old.css.erb)0
-rw-r--r--_assets/css/vendor/normalize.css (renamed from _assets/stylesheets/vendor/normalize.css)0
-rw-r--r--_assets/javascript/g-track.js (renamed from _assets/javascripts/g-track.js)0
-rw-r--r--_assets/javascript/jquery-1.11.0.min.js (renamed from _assets/javascripts/vendor/jquery-1.11.0.min.js)0
-rw-r--r--_assets/javascript/nav.js (renamed from _assets/javascripts/nav.js)0
-rw-r--r--_config.yml3
-rw-r--r--_layouts/default.html20
-rw-r--r--_posts/2013-09-21-Making-of-my-new-site.markdown4
-rw-r--r--_posts/2013-10-16-Virgin-Media-part-1.markdown6
-rw-r--r--_posts/2014-02-04-Virgin-Media-part-2.markdown6
-rw-r--r--_posts/2015-11-21-everki-backpack.adoc8
-rw-r--r--_site.yml3
-rw-r--r--humans.txt6
16 files changed, 116 insertions, 60 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..0ae5b86
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,27 @@
+image: ruby:2.3
+
+variables:
+ JEKYLL_ENV: production
+
+before_script:
+ - bundle install
+
+test:
+ stage: test
+ script:
+ - bundle exec jekyll build -d test
+ artifacts:
+ paths:
+ - test
+ except:
+ - master
+
+pages:
+ stage: deploy
+ script:
+ - bundle exec jekyll build -d public
+ artifacts:
+ paths:
+ - public
+ only:
+ - master
diff --git a/Gemfile.lock b/Gemfile.lock
index 8428cb1..8dac748 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,14 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
- asciidoctor (1.5.5)
+ activesupport (5.1.4)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (~> 0.7)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ asciidoctor (1.5.6.1)
chunky_png (1.3.8)
colorator (1.1.0)
compass (1.0.3)
@@ -20,69 +25,89 @@ GEM
sass (>= 3.2, < 3.5)
concurrent-ruby (1.0.5)
execjs (2.7.0)
- extras (0.1.0)
+ extras (0.3.0)
forwardable-extended (~> 2.5)
- fastimage (2.1.0)
+ fastimage (2.1.1)
ffi (1.9.18)
forwardable-extended (2.6.0)
- jekyll (3.4.3)
+ i18n (0.9.1)
+ concurrent-ruby (~> 1.0)
+ jekyll (3.6.2)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
- kramdown (~> 1.3)
- liquid (~> 3.0)
+ kramdown (~> 1.14)
+ liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
- rouge (~> 1.7)
+ rouge (>= 1.7, < 3)
safe_yaml (~> 1.0)
- jekyll-asciidoc (2.0.1)
+ jekyll-asciidoc (2.1.0)
asciidoctor (>= 1.5.0)
jekyll (>= 2.3.0)
- jekyll-assets (2.2.8)
- extras (~> 0.1)
+ jekyll-assets (3.0.5)
+ activesupport (~> 5.0)
+ execjs (~> 2.7)
+ extras (~> 0.2)
fastimage (~> 2.0, >= 1.8)
- jekyll (~> 3.1, >= 3.0)
- pathutil (>= 0.8)
- rack (> 1, < 2)
- sprockets (~> 3.3, < 3.7)
- jekyll-sass-converter (1.5.0)
+ jekyll (>= 3.5, < 4.0)
+ jekyll-sanity (~> 1.2)
+ liquid-tag-parser (~> 1.0)
+ nokogiri (~> 1.8)
+ pathutil (~> 0.16)
+ sprockets (>= 3.3, < 4.1.beta)
+ jekyll-sanity (1.2.0)
+ jekyll (~> 3.1)
+ jekyll-sass-converter (1.5.1)
sass (~> 3.4)
jekyll-sitemap (1.1.1)
jekyll (~> 3.3)
- jekyll-watch (1.5.0)
- listen (~> 3.0, < 3.1)
+ jekyll-watch (1.5.1)
+ listen (~> 3.0)
jekyll_inline_highlight (3.0)
jekyll (~> 3.0)
json (2.1.0)
- kramdown (1.13.2)
- liquid (3.0.6)
+ kramdown (1.16.2)
+ liquid (4.0.0)
liquid-c (3.0.0)
liquid (>= 3.0.0)
- listen (3.0.8)
+ liquid-tag-parser (1.8.0)
+ extras (~> 0.3)
+ liquid (>= 3.0, < 5.0)
+ listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
+ ruby_dep (~> 1.2)
mercenary (0.3.6)
- multi_json (1.12.1)
- normalize-scss (6.0.0)
+ mini_portile2 (2.3.0)
+ minitest (5.10.3)
+ multi_json (1.12.2)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
+ normalize-scss (7.0.0)
sass (~> 3.3)
- pathutil (0.14.0)
+ pathutil (0.16.1)
forwardable-extended (~> 2.6)
- public_suffix (2.0.5)
- rack (1.6.5)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.8)
- ffi (>= 0.5.0)
+ public_suffix (3.0.1)
+ rack (2.0.3)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
rdiscount (2.2.0.1)
- rouge (1.11.1)
+ rouge (2.2.1)
+ ruby_dep (1.5.0)
safe_yaml (1.0.4)
- sass (3.4.23)
- sprockets (3.6.3)
+ sass (3.4.25)
+ sprockets (4.0.0.beta6)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
support-for (1.0.7)
sass (~> 3.3)
- uglifier (3.2.0)
+ thread_safe (0.3.6)
+ tzinfo (1.2.4)
+ thread_safe (~> 0.1)
+ uglifier (4.0.2)
execjs (>= 0.3.0, < 3)
PLATFORMS
diff --git a/_assets/stylesheets/main.css.scss b/_assets/css/main.css.scss
index 6102ede..6102ede 100644
--- a/_assets/stylesheets/main.css.scss
+++ b/_assets/css/main.css.scss
diff --git a/_assets/stylesheets/main.old.css.erb b/_assets/css/main.old.css.erb
index af62934..af62934 100644
--- a/_assets/stylesheets/main.old.css.erb
+++ b/_assets/css/main.old.css.erb
diff --git a/_assets/stylesheets/vendor/normalize.css b/_assets/css/vendor/normalize.css
index a9c6f52..a9c6f52 100644
--- a/_assets/stylesheets/vendor/normalize.css
+++ b/_assets/css/vendor/normalize.css
diff --git a/_assets/javascripts/g-track.js b/_assets/javascript/g-track.js
index 7d94b17..7d94b17 100644
--- a/_assets/javascripts/g-track.js
+++ b/_assets/javascript/g-track.js
diff --git a/_assets/javascripts/vendor/jquery-1.11.0.min.js b/_assets/javascript/jquery-1.11.0.min.js
index 73f33fb..73f33fb 100644
--- a/_assets/javascripts/vendor/jquery-1.11.0.min.js
+++ b/_assets/javascript/jquery-1.11.0.min.js
diff --git a/_assets/javascripts/nav.js b/_assets/javascript/nav.js
index 239f77e..239f77e 100644
--- a/_assets/javascripts/nav.js
+++ b/_assets/javascript/nav.js
diff --git a/_config.yml b/_config.yml
index db1d3b7..139ad15 100644
--- a/_config.yml
+++ b/_config.yml
@@ -7,7 +7,8 @@ source: ./
plugins_dir: ./_plugins
relative_permalinks: false
exclude: [ 'Gemfile*', '_site/', '.sass-cache/', '.git/' ]
-gems: [ 'support-for', 'normalize-scss' ]
+plugins: [ 'support-for', 'normalize-scss', 'jekyll-asciidoc' ]
+precompile: [ 'main.css.scss' ]
future: true
lsi: false
diff --git a/_layouts/default.html b/_layouts/default.html
index 323f9ba..481b1fd 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -6,13 +6,13 @@
<meta name="description" content="{{ page.description | strip_html }}" />
<title>{{ page.title }} &mdash; versonnen</title>
<link rel="author" href="https://plus.google.com/u/1/107339014878563173999/" />
- <link rel="shortcut icon" sizes="16x16 32x32 48x48 64x64" type="image/x-icon" href="{% asset_path favicon.ico %}" />
+ <link rel="shortcut icon" sizes="16x16 32x32 48x48 64x64" type="image/x-icon" href="{% asset favicon.ico @path %}" />
<meta name="google-site-verification" content="WPvTn3eL3aJ__Um7ImJLjxcF_oAB8Z88Q4fsXrRl4rE" />
<!--[if IE]>
- <link rel="shortcut icon" type="image/x-icon" href="{% asset_path favicon.ico %}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{% asset favicon.ico %}" />
<![endif]-->
<link type="text/plain" rel="author" href="/humans.txt" />
- {% stylesheet main %}
+ {% asset main.css %}
</head>
<!--
__ __
@@ -23,7 +23,7 @@
\ `\___/\ \____\\ \_\\/\____/\ \____/\ \_\ \_\ \_\ \_\ \____\ \_\ \_\
`\/__/ \/____/ \/_/ \/___/ \/___/ \/_/\/_/\/_/\/_/\/____/\/_/\/_/
-COPYRIGHT (C) 2014-2016 Hans-Nikolai Viessmann
+COPYRIGHT (C) 2014-2018 Hans-Nikolai Viessmann
{{ 'HEAD' | gitrev }}
To see a full changelog, navigate to https://blog.hans.ninja/CHANGELOG.txt
@@ -75,21 +75,21 @@ file at https://blog.hans.ninja/humans.txt for more information.
<div id="elevator">
<div><span class="elevator block"><strong>TL;DR</strong></span>I am a computer scientist from Germany studying in Edinburgh</div>
<div><span class="elevator block"><strong>WORKING ON</strong></span>My PhD thesis...</div>
- <div><span class="elevator block"><strong>CONTACT</strong></span>Email me at <em>j<span>i</span>ko</em><span></span>@<span></span><em>han<span></span>s<span></span>.<span></span>nin<span>ja</span></em></div>
+ <div><span class="elevator block"><strong>CONTACT</strong></span>Email me at <em>h<span>a</span>ns</em><span></span>@<span></span><em>vie<span></span>ss<span></span>.<span></span>m<span>n</span></em></div>
</div>
<div id="tags">
- <a rel="author" href="/humans.txt"><img alt="Humans.txt" src="{% asset_path humanstxt-transparent-bw.png %}"/></a>
+ <a rel="author" href="/humans.txt"><img alt="Humans.txt" src="{% asset humanstxt-transparent-bw.png @path %}"/></a>
<a href="//www.w3.org/html/"><img src="//www.w3.org/html/logo/badge/html5-badge-h-css3-semantics.png" width="83" height="33" alt="HTML5 Powered with CSS3 / Styling, and Semantics" title="HTML5 Powered with CSS3 / Styling, and Semantics"></a>
- <a href="//jekyllrb.com/"><img alt="Jekyll" style="border-width:0" src="{% asset_path tag/jekyll.png %}" /></a>
+ <a href="//jekyllrb.com/"><img alt="Jekyll" style="border-width:0" src="{% asset tag/jekyll.png @path %}" /></a>
<a rel="license" href="//creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a>
</div>
<span class="right"><a href="/">front</a> &mdash; <a href="/about-me/">about me</a> &mdash; <a href="/blog/">blog</a> &mdash; <a href="/blog/tags/">tags</a> &mdash; <a href="/blog/categories/">categories</a> &mdash; <a href="/projects/">projects</a> &mdash; <a href="/links/">links</a> &mdash; <a href="/acknowledgements/">acknowledgements</a></span>
</div>
</footer>
- {% javascript g-track type="text/javascript" %}
+ {% asset g-track.js type="text/javascript" %}
<script type="text/javascript" src="//code.jquery.com/jquery-1.11.0.min.js"></script>
- <script type="text/javascript">window.jQuery || document.write('<script src="{% asset_path vendor/jquery-1.11.0.min.js %}"><\/script>')</script>
- {% javascript nav type="text/javascript" %}
+ <script type="text/javascript">window.jQuery || document.write('<script src="{% asset jquery-1.11.0.min.js @path %}"><\/script>')</script>
+ {% asset nav.js type="text/javascript" %}
<!--[if lt IE 9]>
<script src="https://raw.github.com/aFarkas/html5shiv/master/dist/html5shiv.js"></script>
<![endif]-->
diff --git a/_posts/2013-09-21-Making-of-my-new-site.markdown b/_posts/2013-09-21-Making-of-my-new-site.markdown
index 1294587..980f3f9 100644
--- a/_posts/2013-09-21-Making-of-my-new-site.markdown
+++ b/_posts/2013-09-21-Making-of-my-new-site.markdown
@@ -124,8 +124,8 @@ service providers, without there work, this would have been much harder.
[sinatra]: //www.sinatrarb.com/
(actually really cool, I am intending to use this for another project)
[githubp]: //pages.github.com/ (just awesome, thanks GitHub)
-[osfc]: {% asset_path crop/old-site-front-crop.png %}
-[osf]: {% asset_path old-site-front.png %}
+[osfc]: {% asset crop/old-site-front-crop.png @path %}
+[osf]: {% asset old-site-front.png @path %}
(click here to see a full size example)
[lac]: //www.dafont.com/lacuna.font
[ops]: //www.google.com/fonts/specimen/Open+Sans
diff --git a/_posts/2013-10-16-Virgin-Media-part-1.markdown b/_posts/2013-10-16-Virgin-Media-part-1.markdown
index b6c079a..9ccf725 100644
--- a/_posts/2013-10-16-Virgin-Media-part-1.markdown
+++ b/_posts/2013-10-16-Virgin-Media-part-1.markdown
@@ -67,9 +67,9 @@ So far I am really happy with the setup, but I'll be testing it out in full over
the next few days (or weeks) and see how good it really is. Initially though, I
still need to get use to the throttle limits set during most of the day.
-[opma]: {% asset_path article/rose-street-exchange-map-1.png %}
+[opma]: {% asset article/rose-street-exchange-map-1.png @path %}
[smkw]: //www.samknows.com/broadband/exchange/ESROS
-[sptt]: {% asset_path article/speedtest-home-1.png %} (WOW!)
+[sptt]: {% asset article/speedtest-home-1.png @path %} "WOW!"
[scmn]: //www.scotsman.com/business/media-tech-leisure/third-world-broadband-service-at-edinburgh-s-heart-1-3139453
[spts]: //www.speedtest.net/
-[vrsd]: //store.virginmedia.com/broadband/student-broadband/student-broadband.html \ No newline at end of file
+[vrsd]: //store.virginmedia.com/broadband/student-broadband/student-broadband.html
diff --git a/_posts/2014-02-04-Virgin-Media-part-2.markdown b/_posts/2014-02-04-Virgin-Media-part-2.markdown
index 702dc6f..357547f 100644
--- a/_posts/2014-02-04-Virgin-Media-part-2.markdown
+++ b/_posts/2014-02-04-Virgin-Media-part-2.markdown
@@ -103,6 +103,6 @@ getting the upgrade due to them being connected to an older exchange. That's a
bit of a shame, it'd be nice to see if Virgin Media gives compensation for this.
[f]: /blog/technology/computing/2013/10/16/virgin-media-part-1/
-[pingtest1]: {% asset_path article/pingtest-flat-1.png %}
-[sshport1]: {% asset_path article/vm-port-22-1.png %}
-[sshport2]: {% asset_path article/vm-port-greater22-1.png %}
+[pingtest1]: {% asset article/pingtest-flat-1.png @path %}
+[sshport1]: {% asset article/vm-port-22-1.png @path %}
+[sshport2]: {% asset article/vm-port-greater22-1.png @path %}
diff --git a/_posts/2015-11-21-everki-backpack.adoc b/_posts/2015-11-21-everki-backpack.adoc
index 78bbf16..ea1c38e 100644
--- a/_posts/2015-11-21-everki-backpack.adoc
+++ b/_posts/2015-11-21-everki-backpack.adoc
@@ -11,6 +11,8 @@ categories: blog travel wear
tags: backpack everki warranty
---
+:page-liquid:
+
== Introduction
I bought my Everki backpack sometime in 2010, just before I was about to
@@ -39,7 +41,7 @@ to find that this was optional in the Beacon, with a hidden flap providing this
facility when necessary. Finally, the bag comes with a rain cover that can be
stored in a separate pocket underneath the bag.
-image::{% asset_path article/everki/cycle-two-front.jpg %}[Second backpack, 400]
+image::{% asset article/everki/cycle-two-front.jpg @path %}[Second backpack, 400]
When it arrived a few days later, I found myself looking over this well
packaged bag, reading the dozen or so tags connected to every possible space.
@@ -97,7 +99,7 @@ had finally ripped from the bag, a circa 5cm section of the zipper rail hanging
loosely from the bag. This made it impractical - and mostly impossible, to close
the main compartment.
-image:{% asset_path article/everki/broken-zipper.jpg %}[Broken zipper, 600]
+image:{% asset article/everki/broken-zipper.jpg @path %}[Broken zipper, 600]
As before, I contacted the Everki by creating a support ticket and sending them
images of the damage. Within five days they had responded and stated they would
@@ -106,7 +108,7 @@ damaged bag. Because Everki is located in the USA, sending them a damaged bag
would be exorbitantly expensive, so instead they asked if I could destroy the bag
and send them images as proof. I did this, with a bit of revel I must admit.
-image::{% asset_path article/everki/destroyed-front.jpg %}[Destroyed backpack, 600]
+image::{% asset article/everki/destroyed-front.jpg @path %}[Destroyed backpack, 600]
After send them the images of my now completely destroyed bag, they send
confirmation that my new bag was on the way.
diff --git a/_site.yml b/_site.yml
index b7fdd38..0728693 100644
--- a/_site.yml
+++ b/_site.yml
@@ -9,7 +9,8 @@ destination: /home/hans/domains/blog.hans.ninja/public_html
plugins_dir: ./_plugins
relative_permalinks: false
exclude: [ 'Gemfile*', '_site/', '.sass-cache/', '.git/' ]
-gems: [ 'support-for', 'normalize-scss' ]
+plugins: [ 'support-for', 'normalize-scss', 'jekyll-asciidoc' ]
+precompile: [ 'main.css.scss' ]
future: true
lsi: false
diff --git a/humans.txt b/humans.txt
index dd56e33..d925f8d 100644
--- a/humans.txt
+++ b/humans.txt
@@ -3,7 +3,7 @@ description: this is a hack, to get automatic date updating parsing
---
/* TEAM */
Creator: Hans-Nikolai Viessmann
- Contact: jiko [at] hans.ninja
+ Contact: hans [at] viess.mn
From: Germany
In: United Kingdom
@@ -15,6 +15,6 @@ description: this is a hack, to get automatic date updating parsing
Jekyll (Jekyll-Assets, SASS/SCSS, Jekyll-Sitemap, Normalized-SCSS),
HTML5Shiv, JQuery
Software:
- ArchLinux, GIT, VIM, Brave Browser
+ ArchLinux, GIT, VIM, Inox Browser
Hardware: Dell (9550) laptop, Clevo (EN251W) laptop
- Services: Self-hosted
+ Services: Self-hosted, Gitlab-Pages (CE)