diff --git a/_config.yml b/_config.yml index 0b9d808..16d7f24 100644 --- a/_config.yml +++ b/_config.yml @@ -1,7 +1,9 @@ -absolute: http://localhost:4000 +absolute: http://localhost +baseurl: jekyll title: Rik @ St Andrews author: Rik Veenboer email: rik.veenboer@gmail.com +github: https://github.com/boukefalos disqus: boukefalos analytics: UA-46375339-1 gems: [jekyll-paginate] @@ -12,8 +14,8 @@ safe: false environment: dev artifact_commit: dev artifact_branch: master -asset_prefix: /asset -static_prefix: /static/dev +asset_prefix: /jekyll/asset +static_prefix: /jekyll/static/dev exclude: - LICENSE - README diff --git a/_includes/base.html b/_includes/base.html deleted file mode 100644 index 33ab376..0000000 --- a/_includes/base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% assign base = '' %} -{% assign depth = page.url | split: '/' | size | minus: 1 %} -{% if depth == 1 %}{% assign base = '.' %} -{% elsif depth == 2 %}{% assign base = '..' %} -{% elsif depth == 3 %}{% assign base = '../..' %} -{% elsif depth == 4 %}{% assign base = '../../..' %}{% endif %} \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 726b67b..9bb2c03 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,7 +1,7 @@ diff --git a/_includes/header.html b/_includes/header.html index 6d4b937..7a336f9 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,7 +9,7 @@ - + {% if page.description %} @@ -21,7 +21,7 @@ - + @@ -42,11 +42,11 @@ {% if page.print_blurb %} {% endif %}
- {{ site.title }} + {{ site.title }}
- github + github · email
-
- {{ site.baseurl }} -
diff --git a/_includes/icon-github.html b/_includes/icon-github.html deleted file mode 100644 index e501a16..0000000 --- a/_includes/icon-github.html +++ /dev/null @@ -1 +0,0 @@ -{% include icon-github.svg %}{{ include.username }} diff --git a/_includes/icon-github.svg b/_includes/icon-github.svg deleted file mode 100644 index 4422c4f..0000000 --- a/_includes/icon-github.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/_includes/icon-twitter.html b/_includes/icon-twitter.html deleted file mode 100644 index e623dbd..0000000 --- a/_includes/icon-twitter.html +++ /dev/null @@ -1 +0,0 @@ -{{ include.username }} diff --git a/_includes/icon-twitter.svg b/_includes/icon-twitter.svg deleted file mode 100644 index dcf660e..0000000 --- a/_includes/icon-twitter.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/_layouts/gallery-slideshow.html b/_layouts/gallery-slideshow.html index 9e8efaf..cbe783f 100644 --- a/_layouts/gallery-slideshow.html +++ b/_layouts/gallery-slideshow.html @@ -3,7 +3,7 @@ {{ page.title }} - + @@ -139,34 +139,33 @@ PhotoSwipeUI_Default, slides, { - index : index, - mainClass : 'pswp--minimal--dark', - barsSize : { - top: 0, - bottom: 0 - }, - captionEl : false, - shareEl : false, - bgOpacity : 0.85, - tapToClose : true, - tapToToggleControls : false, - history : false, - getThumbBoundsFn : function (index) { - var imgsize = slides[index].mdom.getAttribute('data-size').split('x'); - var coord = slides[index].mdom.getCoordinates(true); - - return { - x : coord.left, - y : coord.top, - w : coord.width - }; - }, - showHideOpacity: true + index : index, + mainClass : 'pswp--minimal--dark', + barsSize : { + top: 0, + bottom: 0 + }, + captionEl : false, + shareEl : false, + bgOpacity : 0.85, + tapToClose : true, + tapToToggleControls : false, + history : false, + getThumbBoundsFn : function (index) { + var imgsize = slides[index].mdom.getAttribute('data-size').split('x'); + var coord = slides[index].mdom.getCoordinates(true); + return { + x : coord.left, + y : coord.top, + w : coord.width + }; + }, + showHideOpacity: true } ); - pswp.init(); + pswp.init(); } else { - pswp.goTo(index); + pswp.goTo(index); } } diff --git a/_sass/_base.scss b/_sass/_base.scss deleted file mode 100644 index 0883c3c..0000000 --- a/_sass/_base.scss +++ /dev/null @@ -1,206 +0,0 @@ -/** - * Reset some basic elements - */ -body, h1, h2, h3, h4, h5, h6, -p, blockquote, pre, hr, -dl, dd, ol, ul, figure { - margin: 0; - padding: 0; -} - - - -/** - * Basic styling - */ -body { - font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family; - color: $text-color; - background-color: $background-color; - -webkit-text-size-adjust: 100%; - -webkit-font-feature-settings: "kern" 1; - -moz-font-feature-settings: "kern" 1; - -o-font-feature-settings: "kern" 1; - font-feature-settings: "kern" 1; - font-kerning: normal; -} - - - -/** - * Set `margin-bottom` to maintain vertical rhythm - */ -h1, h2, h3, h4, h5, h6, -p, blockquote, pre, -ul, ol, dl, figure, -%vertical-rhythm { - margin-bottom: $spacing-unit / 2; -} - - - -/** - * Images - */ -img { - max-width: 100%; - vertical-align: middle; -} - - - -/** - * Figures - */ -figure > img { - display: block; -} - -figcaption { - font-size: $small-font-size; -} - - - -/** - * Lists - */ -ul, ol { - margin-left: $spacing-unit; -} - -li { - > ul, - > ol { - margin-bottom: 0; - } -} - - - -/** - * Headings - */ -h1, h2, h3, h4, h5, h6 { - font-weight: $base-font-weight; -} - - - -/** - * Links - */ -a { - color: $brand-color; - text-decoration: none; - - &:visited { - color: darken($brand-color, 15%); - } - - &:hover { - color: $text-color; - text-decoration: underline; - } -} - - - -/** - * Blockquotes - */ -blockquote { - color: $grey-color; - border-left: 4px solid $grey-color-light; - padding-left: $spacing-unit / 2; - font-size: 18px; - letter-spacing: -1px; - font-style: italic; - - > :last-child { - margin-bottom: 0; - } -} - - - -/** - * Code formatting - */ -pre, -code { - font-size: 15px; - border: 1px solid $grey-color-light; - border-radius: 3px; - background-color: #eef; -} - -code { - padding: 1px 5px; -} - -pre { - padding: 8px 12px; - overflow-x: auto; - - > code { - border: 0; - padding-right: 0; - padding-left: 0; - } -} - - - -/** - * Wrapper - */ -.wrapper { - max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2)); - max-width: calc(#{$content-width} - (#{$spacing-unit} * 2)); - margin-right: auto; - margin-left: auto; - padding-right: $spacing-unit; - padding-left: $spacing-unit; - @extend %clearfix; - - @include media-query($on-laptop) { - max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit})); - max-width: calc(#{$content-width} - (#{$spacing-unit})); - padding-right: $spacing-unit / 2; - padding-left: $spacing-unit / 2; - } -} - - - -/** - * Clearfix - */ -%clearfix { - - &:after { - content: ""; - display: table; - clear: both; - } -} - - - -/** - * Icons - */ -.icon { - - > svg { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: middle; - - path { - fill: $grey-color; - } - } -} diff --git a/_sass/_layout.scss b/_sass/_layout.scss deleted file mode 100644 index 9cbfdde..0000000 --- a/_sass/_layout.scss +++ /dev/null @@ -1,242 +0,0 @@ -/** - * Site header - */ -.site-header { - border-top: 5px solid $grey-color-dark; - border-bottom: 1px solid $grey-color-light; - min-height: 56px; - - // Positioning context for the mobile navigation icon - position: relative; -} - -.site-title { - font-size: 26px; - font-weight: 300; - line-height: 56px; - letter-spacing: -1px; - margin-bottom: 0; - float: left; - - &, - &:visited { - color: $grey-color-dark; - } -} - -.site-nav { - float: right; - line-height: 56px; - - .menu-icon { - display: none; - } - - .page-link { - color: $text-color; - line-height: $base-line-height; - - // Gaps between nav items, but not on the last one - &:not(:last-child) { - margin-right: 20px; - } - } - - @include media-query($on-palm) { - position: absolute; - top: 9px; - right: $spacing-unit / 2; - background-color: $background-color; - border: 1px solid $grey-color-light; - border-radius: 5px; - text-align: right; - - .menu-icon { - display: block; - float: right; - width: 36px; - height: 26px; - line-height: 0; - padding-top: 10px; - text-align: center; - - > svg { - width: 18px; - height: 15px; - - path { - fill: $grey-color-dark; - } - } - } - - .trigger { - clear: both; - display: none; - } - - &:hover .trigger { - display: block; - padding-bottom: 5px; - } - - .page-link { - display: block; - padding: 5px 10px; - - &:not(:last-child) { - margin-right: 0; - } - margin-left: 20px; - } - } -} - - - -/** - * Site footer - */ -.site-footer { - border-top: 1px solid $grey-color-light; - padding: $spacing-unit 0; -} - -.footer-heading { - font-size: 18px; - margin-bottom: $spacing-unit / 2; -} - -.contact-list, -.social-media-list { - list-style: none; - margin-left: 0; -} - -.footer-col-wrapper { - font-size: 15px; - color: $grey-color; - margin-left: -$spacing-unit / 2; - @extend %clearfix; -} - -.footer-col { - float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; -} - -.footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); -} - -.footer-col-2 { - width: -webkit-calc(20% - (#{$spacing-unit} / 2)); - width: calc(20% - (#{$spacing-unit} / 2)); -} - -.footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); -} - -@include media-query($on-laptop) { - .footer-col-1, - .footer-col-2 { - width: -webkit-calc(50% - (#{$spacing-unit} / 2)); - width: calc(50% - (#{$spacing-unit} / 2)); - } - - .footer-col-3 { - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - -@include media-query($on-palm) { - .footer-col { - float: none; - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - - - -/** - * Page content - */ -.page-content { - padding: $spacing-unit 0; -} - -.page-heading { - font-size: 20px; -} - -.post-list { - margin-left: 0; - list-style: none; - - > li { - margin-bottom: $spacing-unit; - } -} - -.post-meta { - font-size: $small-font-size; - color: $grey-color; -} - -.post-link { - display: block; - font-size: 24px; -} - - - -/** - * Posts - */ -.post-header { - margin-bottom: $spacing-unit; -} - -.post-title { - font-size: 42px; - letter-spacing: -1px; - line-height: 1; - - @include media-query($on-laptop) { - font-size: 36px; - } -} - -.post-content { - margin-bottom: $spacing-unit; - - h2 { - font-size: 32px; - - @include media-query($on-laptop) { - font-size: 28px; - } - } - - h3 { - font-size: 26px; - - @include media-query($on-laptop) { - font-size: 22px; - } - } - - h4 { - font-size: 20px; - - @include media-query($on-laptop) { - font-size: 18px; - } - } -} diff --git a/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss deleted file mode 100644 index 8fac597..0000000 --- a/_sass/_syntax-highlighting.scss +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Syntax highlighting styles - */ -.highlight { - background: #fff; - @extend %vertical-rhythm; - - .highlighter-rouge & { - background: #eef; - } - - .c { color: #998; font-style: italic } // Comment - .err { color: #a61717; background-color: #e3d2d2 } // Error - .k { font-weight: bold } // Keyword - .o { font-weight: bold } // Operator - .cm { color: #998; font-style: italic } // Comment.Multiline - .cp { color: #999; font-weight: bold } // Comment.Preproc - .c1 { color: #998; font-style: italic } // Comment.Single - .cs { color: #999; font-weight: bold; font-style: italic } // Comment.Special - .gd { color: #000; background-color: #fdd } // Generic.Deleted - .gd .x { color: #000; background-color: #faa } // Generic.Deleted.Specific - .ge { font-style: italic } // Generic.Emph - .gr { color: #a00 } // Generic.Error - .gh { color: #999 } // Generic.Heading - .gi { color: #000; background-color: #dfd } // Generic.Inserted - .gi .x { color: #000; background-color: #afa } // Generic.Inserted.Specific - .go { color: #888 } // Generic.Output - .gp { color: #555 } // Generic.Prompt - .gs { font-weight: bold } // Generic.Strong - .gu { color: #aaa } // Generic.Subheading - .gt { color: #a00 } // Generic.Traceback - .kc { font-weight: bold } // Keyword.Constant - .kd { font-weight: bold } // Keyword.Declaration - .kp { font-weight: bold } // Keyword.Pseudo - .kr { font-weight: bold } // Keyword.Reserved - .kt { color: #458; font-weight: bold } // Keyword.Type - .m { color: #099 } // Literal.Number - .s { color: #d14 } // Literal.String - .na { color: #008080 } // Name.Attribute - .nb { color: #0086B3 } // Name.Builtin - .nc { color: #458; font-weight: bold } // Name.Class - .no { color: #008080 } // Name.Constant - .ni { color: #800080 } // Name.Entity - .ne { color: #900; font-weight: bold } // Name.Exception - .nf { color: #900; font-weight: bold } // Name.Function - .nn { color: #555 } // Name.Namespace - .nt { color: #000080 } // Name.Tag - .nv { color: #008080 } // Name.Variable - .ow { font-weight: bold } // Operator.Word - .w { color: #bbb } // Text.Whitespace - .mf { color: #099 } // Literal.Number.Float - .mh { color: #099 } // Literal.Number.Hex - .mi { color: #099 } // Literal.Number.Integer - .mo { color: #099 } // Literal.Number.Oct - .sb { color: #d14 } // Literal.String.Backtick - .sc { color: #d14 } // Literal.String.Char - .sd { color: #d14 } // Literal.String.Doc - .s2 { color: #d14 } // Literal.String.Double - .se { color: #d14 } // Literal.String.Escape - .sh { color: #d14 } // Literal.String.Heredoc - .si { color: #d14 } // Literal.String.Interpol - .sx { color: #d14 } // Literal.String.Other - .sr { color: #009926 } // Literal.String.Regex - .s1 { color: #d14 } // Literal.String.Single - .ss { color: #990073 } // Literal.String.Symbol - .bp { color: #999 } // Name.Builtin.Pseudo - .vc { color: #008080 } // Name.Variable.Class - .vg { color: #008080 } // Name.Variable.Global - .vi { color: #008080 } // Name.Variable.Instance - .il { color: #099 } // Literal.Number.Integer.Long -} diff --git a/blog/atom.xml b/blog/atom.xml index ae870d8..4e68106 100644 --- a/blog/atom.xml +++ b/blog/atom.xml @@ -1,13 +1,12 @@ --- layout: null --- -{% include base.html %} - {{ site.baseurl }}/ + {{ site.absolute }}/{{ site.baseurl }}/ {{ site.author }} - - + + {{ site.time|date_to_xmlschema }} {{ site.author }} @@ -17,7 +16,7 @@ layout: null {{ site.absolute }}/{{ post.id }} {{ post.title }} - + {{ post.date|date_to_xmlschema }} {{ post.content|xml_escape }} diff --git a/gallery/index.html b/gallery/index.html index d72717b..5afe651 100644 --- a/gallery/index.html +++ b/gallery/index.html @@ -6,7 +6,7 @@ layout: default
{% loopdir path:"gallery" match:"*/index.html" sort:"-date" %}
- + {{ item.title }} {{ item.title }} {% if item.date %}
diff --git a/gallery/index.md b/gallery/index.md deleted file mode 100644 index 581f2dd..0000000 --- a/gallery/index.md +++ /dev/null @@ -1,67 +0,0 @@ ---- -id: 41 -title: Gallery -author: Rik -layout: page -guid: http://csbnw.no-ip.org:38/?page_id=41 ---- -Naast foto’s die bij bepaalde activiteiten horen, kom vaak situaties tegen die ik de moeite waard vind om op beeld vast te leggen. Navigeer via het menu naar de betreffende albums, of bekijk deze willekeurige foto’s: - - - - - - Wist je dat ik alle foto’s op dit blog met de camera op mijn HTC One S maak? Geloof het of niet, maar zelfs de prachtige panorama’s boven elke pagina zijn daarvan afkomstig.  \ No newline at end of file diff --git a/index.html b/index.html index b7a656c..a4dfb0f 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ --- title: Home layout: default -tags: danny daniel berger dpb587 dbchip2000 +tags: blog scotland chemistry phd ---
@@ -18,7 +18,7 @@ tags: danny daniel berger dpb587 dbchip2000
-

{{ post.title }}

+

{{ post.title }}

{% if post.description %}
{{ post.description }}
{% endif %}