Commit 07562b70 authored by Martin Isaksson's avatar Martin Isaksson
Browse files

upgrade

parent f34674e7
_site
.sass-cache
_site/
.sass-cache/
.jekyll-cache/
.jekyll-metadata
*.sublime-*
Gemfile.lock
_drafts/
\ No newline at end of file
---
layout: default
title: "404: Page not found"
permalink: 404.html
---
<div class="page">
<h1 class="page-title">404: Page not found</h1>
<p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ site.baseurl }}/">Head back home</a> to try finding it again.</p>
<style type="text/css" media="screen">
.container {
margin: 10px auto;
max-width: 600px;
text-align: center;
}
h1 {
margin: 30px 0;
font-size: 4em;
line-height: 1;
letter-spacing: -1px;
}
</style>
<div class="container">
<h1>404</h1>
<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found.</p>
</div>
blog.martisak.se
source 'https://rubygems.org'
source "https://rubygems.org"
require 'json'
require 'open-uri'
versions = JSON.parse(open('https://pages.github.com/versions.json').read)
gem "github-pages", 191, group: :jekyll_plugins
gem 'github-pages', versions['github-pages']
# Hello! This is where you manage which Jekyll version is used to run.
# When you want to use a different version, change it below, save the
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
#
# bundle exec jekyll serve
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "~> 3.7.3"
# This is the default theme for new Jekyll sites. You may change this to anything you like.
gem "minima", "~> 2.0"
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`.
# gem "github-pages", group: :jekyll_plugins
# If you have any plugins, put them here!
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem 'jekyll-scholar'
gem 'jekyll-avatar'
gem 'jekyll-gist'
gem 'jekyll-paginate'
gem 'jekyll-email-protect'
# gem "jekyll-remote-theme"
end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.0" if Gem.win_platform?
gem 'csl-styles'
gem 'citeproc-ruby'
\ No newline at end of file
SOURCES=$(wildcard _source/*.Rmd)
MD_OBJECTS=$(SOURCES:.Rmd=.md)
DRAFT_DIR=_drafts
DRAFT_MD_OBJECTS := $(addprefix $(DRAFT_DIR)/,$(notdir $(MD_OBJECTS)))
RSCRIPT=Rscript
BUNDLE := bundle
JEKYLL := $(BUNDLE) exec jekyll
PROJECT_DEPS := Gemfile
serve: install posts
bundle exec jekyll serve --drafts
posts: $(MD_OBJECTS)
check:
$(JEKYLL) doctor
install: $(PROJECT_DEPS)
$(BUNDLE) install
update: $(PROJECT_DEPS)
$(BUNDLE) update
clean:
-rm -rf _serve
-rm $(MD_OBJECTS)
-rm $(DRAFT_MD_OBJECTS)
%.md: %.Rmd
$(RSCRIPT) -e 'library(knitr); knitr::opts_knit$$set(base.dir = "$(PWD)", base.url = "/"); knit("$<", output="$@")'
mv $@ _drafts
/Users/eisamar/devel/templates/bibtex/mendeley/MartinWASP.bib
\ No newline at end of file
/Users/eisamar/devel/templates/bibtex/mendeley/Other.bib
\ No newline at end of file
# Permalinks
# Welcome to Jekyll!
#
# Use of `relative_permalinks` ensures post links from the index work properly.
permalink: pretty
relative_permalinks: true
# Setup
title: Martin's blog
tagline: 'I am what I am.'
description: 'description goes here'
url: http://martisak.github.io
baseurl: 'http://martisak.github.io'
paginate: 5
# About/contact
author:
name: Martin Isaksson
url: http://cv.martisak.se
email: martin@martisak.se
# Custom vars
version: 1.0.1
# This config file is meant for settings that affect your whole blog, values
# which you are expected to set up once and rarely edit after that. If you find
# yourself editing this file very often, consider using Jekyll's data files
# feature for the data you need to update frequently.
#
# For technical reasons, this file is *NOT* reloaded automatically when you use
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
# Site settings
# These are used to personalize your new site. If you look in the HTML files,
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
# You can create any custom variable you would like, and they will be accessible
# in the templates via {{ site.myvariable }}.
title: Martin's blog
email: martin@martisak.se
description: >- # this means to ignore newlines until "baseurl:"
Researcher, PhD candidate, engineer
baseurl: "" # the subpath of your site, e.g. /blog
url: "http://blog.martisak.se" # the base hostname & protocol for your site, e.g. http://example.com
twitter_username: martin_isaksson
github_username: martisak
linkedin_username: martisak
# Build settings
markdown: kramdown
theme: minima
repository: martisak/martisak.github.io
plugins:
- jekyll-feedxw
- github-pages
- jekyll-avatar
- jekyll/scholar
- jekyll-gist
- jekyll-paginate
- jekyll-email-protect
# - jekyll-remote-theme
paginate: 5
# remote_theme: benbalter/retlab
# permalink: /blog/:year/:month/:day/:title/
# Exclude from processing.
# The following items will not be processed, by default. Create a custom list
# to override the default setting.
exclude:
- Makefile
- Gemfile
- Gemfile.lock
- node_modules
- vendor/bundle/
- vendor/cache/
- vendor/gems/
- vendor/ruby/
scholar:
style: apa
bibliography: "*.bib"
defaults:
-
scope:
path: ""
type: "pages"
values:
layout: "post"
excerpt_separator: <!--more-->
collections:
publications:
output: True
<footer class="site-footer h-card">
<data class="u-url" href="{{ "/" | relative_url }}"></data>
<div class="wrapper">
<h2 class="footer-heading">{{ site.title | escape }}</h2>
<div class="footer-col-wrapper">
<div class="footer-col footer-col-1">
<ul class="contact-list">
<li class="p-name">
{%- if site.author -%}
{{ site.author | escape }}
{%- else -%}
{{ site.title | escape }}
{%- endif -%}
</li>
{%- if site.email -%}
<li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
{%- endif -%}
</ul>
</div>
<div class="footer-col footer-col-2">
{%- include social.html -%}
</div>
<div class="footer-col footer-col-3">
<p>{{- site.description | escape -}}</p>
</div>
</div>
</div>
</footer>
<head>
<link href="http://gmpg.org/xfn/11" rel="profile">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<!-- Enable responsiveness on mobile devices-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<title>
{% if page.title == "Home" %}
{{ site.title }} &middot; {{ site.tagline }}
{% else %}
{{ page.title }} &middot; {{ site.title }}
{% endif %}
</title>
<!-- CSS -->
<link rel="stylesheet" href="{{ site.baseurl }}/public/css/poole.css">
<link rel="stylesheet" href="{{ site.baseurl }}/public/css/syntax.css">
<link rel="stylesheet" href="{{ site.baseurl }}/public/css/lanyon.css">
<!-- Icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/public/apple-touch-icon-precomposed.png">
<link rel="shortcut icon" href="{{ site.baseurl }}/public/favicon.ico">
<!-- RSS -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
</head>
<span class="reading-time"><i class="fas fa-stopwatch"></i>&nbsp;{%- assign words = include.content | strip_html | number_of_words -%}{{ words | divided_by: 180 | plus: 1 }} min read.</span>
\ No newline at end of file
<!-- Target for toggling the sidebar `.sidebar-checkbox` is for regular
styles, `#sidebar-checkbox` for behavior. -->
<input type="checkbox" class="sidebar-checkbox" id="sidebar-checkbox">
<!-- Toggleable sidebar -->
<div class="sidebar" id="sidebar">
<div class="sidebar-item">
<p>{{ site.description }}</p>
</div>
<nav class="sidebar-nav">
<a class="sidebar-nav-item{% if page.url == site.baseurl %} active{% endif %}" href="{{ site.baseurl }}/">Home</a>
{% comment %}
The code below dynamically generates a sidebar nav of pages with
`layout: page` in the front-matter. See readme for usage.
{% endcomment %}
{% assign pages_list = site.pages | sort:"url" %}
{% for node in pages_list %}
{% if node.title != null %}
{% if node.layout == "page" %}
<a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ node.url }}">{{ node.title }}</a>
{% endif %}
{% endif %}
{% endfor %}
<!--<a class="sidebar-nav-item" href="{{ site.github.repo }}/archive/v{{ site.version }}.zip">Download</a>-->
<a class="sidebar-nav-item" href="{{ site.github.repo }}">GitHub project</a>
<span class="sidebar-nav-item">Currently v{{ site.version }}</span>
</nav>
<div class="sidebar-item">
<p>
&copy; {{ site.time | date: '%Y' }}. All rights reserved.
</p>
</div>
</div>
---
---
{{ reference }}
<!DOCTYPE html>
<html lang="en-us">
{% include head.html %}
<body>
{% include sidebar.html %}
<!-- Wrap is the content to shift when toggling the sidebar. We wrap the
content to avoid any CSS collisions with our real content. -->
<div class="wrap">
<div class="masthead">
<div class="container">
<h3 class="masthead-title">
<a href="{{ site.baseurl }}/" title="Home">{{ site.title }}</a>
<small>{{ site.tagline }}</small>
</h3>
</div>
</div>
<div class="container content">
{{ content }}
</div>
</div>
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
<script>
(function(document) {
var toggle = document.querySelector('.sidebar-toggle');
var sidebar = document.querySelector('#sidebar');
var checkbox = document.querySelector('#sidebar-checkbox');
document.addEventListener('click', function(e) {
var target = e.target;
if(!checkbox.checked ||
sidebar.contains(target) ||
(target === checkbox || target === toggle)) return;
checkbox.checked = false;
}, false);
})(document);
</script>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment