Skip to content

GitLab

Commit 505400f2 authored by Bertjan Broeksema's avatar Bertjan Broeksema
Browse files
Options

Update the jekyll them based on a "jekyll new" from v3.0.0

parent 928bbec0
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 63 deletions
_includes/footer.html
View file @ 505400f2
...@@ -5,48 +5,31 @@ ...@@ -5,48 +5,31 @@
<h2 class="footer-heading">{{ site.title }}</h2> <h2 class="footer-heading">{{ site.title }}</h2>
<div class="footer-col-wrapper"> <div class="footer-col-wrapper">
<div class="footer-col footer-col-1"> <div class="footer-col footer-col-1">
<ul class="contact-list"> <ul class="contact-list">
<li>{{ site.title }}</li> <li>{{ site.title }}</li>
<li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li> <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
</ul> </ul>
</div> </div>
<div class="footer-col footer-col-2"> <div class="footer-col footer-col-2">
<ul class="social-media-list"> <ul class="social-media-list">
{% if site.github_username %} {% if site.github_username %}
<li> <li>
<a href="https://github.com/{{ site.github_username }}"> {% include icon-github.html username=site.github_username %}
<span class="icon icon--github">
<svg viewBox="0 0 16 16">
<path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
</svg>
</span>
<span class="username">{{ site.github_username }}</span>
</a>
</li> </li>
{% endif %} {% endif %}
{% if site.twitter_username %} {% if site.twitter_username %}
<li> <li>
<a href="https://twitter.com/{{ site.twitter_username }}"> {% include icon-twitter.html username=site.twitter_username %}
<span class="icon icon--twitter">
<svg viewBox="0 0 16 16">
<path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
</svg>
</span>
<span class="username">{{ site.twitter_username }}</span>
</a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
<div class="footer-col footer-col-3"> <div class="footer-col footer-col-3">
<p class="text">{{ site.description }}</p> <p>{{ site.description }}</p>
</div> </div>
</div> </div>
......
_includes/head.html
View file @ 505400f2
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width initial-scale=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title> <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{{ site.description }}"> <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}"> <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}"> <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
</head> </head>
_includes/header.html
View file @ 505400f2
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
</a> </a>
<div class="trigger"> <div class="trigger">
{% for page in site.pages %} {% for my_page in site.pages %}
{% if page.title %} {% if my_page.title %}
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a> <a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
......
_includes/icon-github.html 0 → 100644
View file @ 505400f2
<a href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>
_includes/icon-github.svg 0 → 100644
View file @ 505400f2
<svg viewBox="0 0 16 16"><path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/></svg>
_includes/icon-twitter.html 0 → 100644
View file @ 505400f2
<a href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>
_includes/icon-twitter.svg 0 → 100644
View file @ 505400f2
<svg viewBox="0 0 16 16"><path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/></svg>
_layouts/page.html
View file @ 505400f2
--- ---
layout: default layout: default
--- ---
<div class="post"> <article class="post">
<header class="post-header"> <header class="post-header">
<h1 class="post-title">{{ page.title }}</h1> <h1 class="post-title">{{ page.title }}</h1>
</header> </header>
<article class="post-content"> <div class="post-content">
{{ content }} {{ content }}
</article> </div>
</div> </article>
_layouts/post.html
View file @ 505400f2
--- ---
layout: default layout: default
--- ---
<div class="post"> <article class="post" itemscope itemtype="http://schema.org/BlogPosting">
<header class="post-header"> <header class="post-header">
<h1 class="post-title">{{ page.title }}</h1> <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
<p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p> <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
</header> </header>
<article class="post-content"> <div class="post-content" itemprop="articleBody">
{{ content }} {{ content }}
</article> </div>
</div> </article>
_sass/_base.scss
View file @ 505400f2
...@@ -14,13 +14,15 @@ dl, dd, ol, ul, figure { ...@@ -14,13 +14,15 @@ dl, dd, ol, ul, figure {
* Basic styling * Basic styling
*/ */
body { body {
font-family: $base-font-family; font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
font-size: $base-font-size;
line-height: $base-line-height;
font-weight: 300;
color: $text-color; color: $text-color;
background-color: $background-color; background-color: $background-color;
-webkit-text-size-adjust: 100%; -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;
} }
...@@ -80,7 +82,7 @@ li { ...@@ -80,7 +82,7 @@ li {
* Headings * Headings
*/ */
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-weight: 300; font-weight: $base-font-weight;
} }
...@@ -139,7 +141,7 @@ code { ...@@ -139,7 +141,7 @@ code {
pre { pre {
padding: 8px 12px; padding: 8px 12px;
overflow-x: scroll; overflow-x: auto;
> code { > code {
border: 0; border: 0;
...@@ -154,8 +156,8 @@ pre { ...@@ -154,8 +156,8 @@ pre {
* Wrapper * Wrapper
*/ */
.wrapper { .wrapper {
max-width: -webkit-calc(800px - (#{$spacing-unit} * 2)); max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
max-width: calc(800px - (#{$spacing-unit} * 2)); max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-right: $spacing-unit; padding-right: $spacing-unit;
...@@ -163,8 +165,8 @@ pre { ...@@ -163,8 +165,8 @@ pre {
@extend %clearfix; @extend %clearfix;
@include media-query($on-laptop) { @include media-query($on-laptop) {
max-width: -webkit-calc(800px - (#{$spacing-unit})); max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
max-width: calc(800px - (#{$spacing-unit})); max-width: calc(#{$content-width} - (#{$spacing-unit}));
padding-right: $spacing-unit / 2; padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2; padding-left: $spacing-unit / 2;
} }
......
_sass/_layout.scss
View file @ 505400f2
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
.site-title { .site-title {
font-size: 26px; font-size: 26px;
font-weight: 300;
line-height: 56px; line-height: 56px;
letter-spacing: -1px; letter-spacing: -1px;
margin-bottom: 0; margin-bottom: 0;
...@@ -35,16 +36,16 @@ ...@@ -35,16 +36,16 @@
color: $text-color; color: $text-color;
line-height: $base-line-height; line-height: $base-line-height;
// Gaps between nav items, but not on the first one // Gaps between nav items, but not on the last one
&:not(:first-child) { &:not(:last-child) {
margin-left: 20px; margin-right: 20px;
} }
} }
@include media-query($on-palm) { @include media-query($on-palm) {
position: absolute; position: absolute;
top: 9px; top: 9px;
right: 30px; right: $spacing-unit / 2;
background-color: $background-color; background-color: $background-color;
border: 1px solid $grey-color-light; border: 1px solid $grey-color-light;
border-radius: 5px; border-radius: 5px;
...@@ -82,6 +83,11 @@ ...@@ -82,6 +83,11 @@
.page-link { .page-link {
display: block; display: block;
padding: 5px 10px; padding: 5px 10px;
&:not(:last-child) {
margin-right: 0;
}
margin-left: 20px;
} }
} }
} }
......
_sass/_syntax-highlighting.scss
View file @ 505400f2
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
background: #fff; background: #fff;
@extend %vertical-rhythm; @extend %vertical-rhythm;
.highlighter-rouge & {
background: #eef;
}
.c { color: #998; font-style: italic } // Comment .c { color: #998; font-style: italic } // Comment
.err { color: #a61717; background-color: #e3d2d2 } // Error .err { color: #a61717; background-color: #e3d2d2 } // Error
.k { font-weight: bold } // Keyword .k { font-weight: bold } // Keyword
......
about.md
View file @ 505400f2
...@@ -6,6 +6,10 @@ permalink: /about/ ...@@ -6,6 +6,10 @@ permalink: /about/
This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/) This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new) You can find the source code for the Jekyll new theme at:
{% include icon-github.html username="jglovier" %} /
[jekyll-new](https://github.com/jglovier/jekyll-new)
You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll) You can find the source code for Jekyll at
{% include icon-github.html username="jekyll" %} /
[jekyll](https://github.com/jekyll/jekyll)
css/main.scss 100755 → 100644
View file @ 505400f2
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
// Our variables // Our variables
$base-font-family: Helvetica, Arial, sans-serif; $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
$base-font-size: 16px; $base-font-size: 16px;
$base-font-weight: 400;
$small-font-size: $base-font-size * 0.875; $small-font-size: $base-font-size * 0.875;
$base-line-height: 1.5; $base-line-height: 1.5;
...@@ -21,13 +22,16 @@ $grey-color: #828282; ...@@ -21,13 +22,16 @@ $grey-color: #828282;
$grey-color-light: lighten($grey-color, 40%); $grey-color-light: lighten($grey-color, 40%);
$grey-color-dark: darken($grey-color, 25%); $grey-color-dark: darken($grey-color, 25%);
// Width of the content area
$content-width: 800px;
$on-palm: 600px; $on-palm: 600px;
$on-laptop: 800px; $on-laptop: 800px;
// Using media queries with like this: // Use media queries like this:
// @include media-query($palm) { // @include media-query($on-palm) {
// .wrapper { // .wrapper {
// padding-right: $spacing-unit / 2; // padding-right: $spacing-unit / 2;
// padding-left: $spacing-unit / 2; // padding-left: $spacing-unit / 2;
......
feed.xml
View file @ 505400f2
...@@ -7,7 +7,7 @@ layout: null ...@@ -7,7 +7,7 @@ layout: null
<title>{{ site.title | xml_escape }}</title> <title>{{ site.title | xml_escape }}</title>
<description>{{ site.description | xml_escape }}</description> <description>{{ site.description | xml_escape }}</description>
<link>{{ site.url }}{{ site.baseurl }}/</link> <link>{{ site.url }}{{ site.baseurl }}/</link>
<atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" /> <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
<pubDate>{{ site.time | date_to_rfc822 }}</pubDate> <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
<lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate> <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
<generator>Jekyll v{{ jekyll.version }}</generator> <generator>Jekyll v{{ jekyll.version }}</generator>
......
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

Luxembourg Institute of Science and Technology - www.list.lu.