Skip to content
This repository has been archived by the owner on May 22, 2021. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (528 commits)
  Fix docs. Change Isaac Newton with Albert Einstein (mmistakes#1508)
  Replace `|` with HTML entity when used as title separator
  Update stale.yml
  Remove ignore file
  Fix border bottom for Gist line numbers
  Update CHANGELOG and history
  fix a typo in 04-upgrading.md (mmistakes#1487)
  Update CHANGELOG and history
  Remove extra spaces after :
  Fix jsonify name in seo.html application/ld+json script (mmistakes#1485)
  Update CHANGELOG and history
  Add archive feature row test page
  Add archive feature row test page
  Adjust feature row styling when used on an `archive` layout
  Remove misleading underline hover state
  Replace toc include with `toc: true`
  Remove base_path include from pages
  Reduce font-size of page meta in list/grid items
  Underline archive item titles
  Update issue template
  ...
  • Loading branch information
martinbjeldbak committed Feb 1, 2018
2 parents ce392e5 + 3598e8e commit 47f7237
Show file tree
Hide file tree
Showing 204 changed files with 11,529 additions and 11,862 deletions.
46 changes: 44 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Michael Rose
Copyright (c) 2013-2018 Michael Rose and contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,46 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

Minimal Mistakes incorporates icons from [The Noun Project](https://thenounproject.com/)
creators Garrett Knoll, Arthur Shlain, and Tracy Tam.
Icons are distributed under Creative Commons Attribution 3.0 United States (CC BY 3.0 US).

Minimal Mistakes incorporates [Font Awesome](http://fontawesome.io/),
Copyright (c) 2017 Dave Gandy.
Font Awesome is distributed under the terms of the [SIL OFL 1.1](http://scripts.sil.org/OFL)
and [MIT License](http://opensource.org/licenses/MIT).

Minimal Mistakes incorporates photographs from [Unsplash](https://unsplash.com).

Minimal Mistakes incorporates [Susy](http://susy.oddbird.net/),
Copyright (c) 2017, Miriam Eric Suzanne.
Susy is distributed under the terms of the [BSD 3-clause "New" or "Revised" License](https://opensource.org/licenses/BSD-3-Clause).

Minimal Mistakes incorporates [Breakpoint](http://breakpoint-sass.com/).
Breakpoint is distributed under the terms of the [MIT/GPL Licenses](http://opensource.org/licenses/MIT).

Minimal Mistakes incorporates [FitVids.js](https://github.com/davatron5000/FitVids.js/),
Copyright (c) 2013 Dave Rubert and Chris Coyier.
FitVids is distributed under the terms of the [WTFPL License](http://sam.zoy.org/wtfpl/).

Minimal Mistakes incorporates [Magnific Popup](http://dimsemenov.com/plugins/magnific-popup/),
Copyright (c) 2014-2016 Dmitry Semenov, http://dimsemenov.com.
Magnific Popup is distributed under the terms of the MIT License.

Minimal Mistakes incorporates [jQuery Smooth Scroll](https://github.com/kswedberg/jquery-smooth-scroll),
Copyright (c) 2017 Karl Swedberg.
jQuery Smooth Scroll is distributed under the terms of the [MIT License](http://opensource.org/licenses/MIT).

Minimal Mistakes incorporates [GreedyNav.js](https://github.com/lukejacksonn/GreedyNav),
Copyright (c) 2015 Luke Jackson.
GreedyNav.js is distributed under the terms of the [MIT License](http://opensource.org/licenses/MIT).

Minimal Mistakes incorporates [Jekyll Group-By-Array](https://github.com/mushishi78/jekyll-group-by-array),
Copyright (c) 2015 Max White <mushishi78@gmail.com>.
Jekyll Group-By-Array is distributed under the terms of the [MIT License](http://opensource.org/licenses/MIT).

Minimal Mistakes incorporates [Lunr](http://lunrjs.com),
Copyright (c) 2017 Oliver Nightingale.
Lunr is distributed under the terms of the [MIT License](http://opensource.org/licenses/MIT).
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ task :preview do

ENV["LISTEN_GEM_DEBUGGING"] = "1"
listener = Listen.to(
base.join("_data"),
base.join("_includes"),
base.join("_layouts"),
base.join("_sass"),
Expand Down
62 changes: 32 additions & 30 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
# For technical reasons, this file is *NOT* reloaded automatically when you use
# `jekyll serve`. If you change this file, please restart the server process.

minimal_mistakes_skin : "default" # "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum", "sunrise"

# Site Settings
locale : "en_AU"
title : "Martin Bjeldbak Madsen"
Expand All @@ -29,29 +31,34 @@ comments:
num_posts : # 5 (default)
colorscheme : # "light" (default), "dark"
staticman:
allowedFields : ['name', 'email', 'url', 'message']
branch : "master"
commitMessage : "New comment."
filename : comment-{@timestamp}
format : "yml"
moderation : true
path : "docs/_data/comments/{options.slug}" # "/_data/comments/{options.slug}" (default)
requiredFields : ['name', 'email', 'message']
allowedFields : # ['name', 'email', 'url', 'message']
branch : # "master"
commitMessage : # "New comment."
filename : # comment-{@timestamp}
format : # "yml"
moderation : # true
path : # "/_data/comments/{options.slug}" (default)
requiredFields : # ['name', 'email', 'message']
transforms:
email : "md5"
email : # "md5"
generatedFields:
date:
type : "date"
type : # "date"
options:
format : "iso8601" # "iso8601" (default), "timestamp-seconds", "timestamp-milliseconds"
format : # "iso8601" (default), "timestamp-seconds", "timestamp-milliseconds"
reCaptcha:
siteKey :
secret :
atom_feed:
path : # blank (default) uses feed.xml
search : # true, false (default)
search_full_content : # true, false (default)

# SEO Related
google_site_verification : # already verified via google analytics
bing_site_verification : "D2178E33FDC6731D0D6810C6100F5AE5"
alexa_site_verification :
yandex_site_verification :
naver_site_verification :

# Social Sharing
twitter:
Expand Down Expand Up @@ -84,16 +91,24 @@ author:
location : "Brisbane, Australia"
email : "martinbmadsen@gmail.com"
uri :
home : # null (default), "absolute or relative url to link to author home"
bitbucket :
codepen :
dribbble :
flickr :
facebook :
foursquare :
github : "martinbjeldbak"
keybase : # "martinb"
gitlab :
google_plus :
keybase :
instagram :
lastfm :
linkedin : "martinbjeldbak"
pinterest :
soundcloud :
stackoverflow : # "660936/martin"
steam :
steam : # "steamId" (the last part of your profile url, e.g. https://steamcommunity.com/id/steamId/)
tumblr :
twitter : "martinbjeldbak"
vine :
Expand Down Expand Up @@ -165,8 +180,8 @@ paginate_path: /page:num/
timezone: Brisbane/Australia # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones


# Plugins
gems:
# Plugins (previously gems:)
plugins:
- jekyll-paginate
- jekyll-sitemap
- jekyll-gist
Expand Down Expand Up @@ -229,22 +244,9 @@ defaults:
author_profile: true
read_time: true
comments: # true
share:
pagination: false
share: true
related: true
footer_hide_social: false
# _pages
- scope:
path: ""
type: pages
values:
layout: single
author_profile: true


images:
path : "/assets/images"
post_path : "/assets/images/posts"

cv_path: "/cv.pdf"
thesis_path: "/thesis.pdf"
Loading

0 comments on commit 47f7237

Please sign in to comment.