een serie aan veranderingen

This commit is contained in:
mb@mb 2017-10-20 15:59:16 +02:00
parent 317c184070
commit ecba0a62ff
18 changed files with 98 additions and 145 deletions

View File

@ -3,8 +3,9 @@ Date: 2017-08-29
Category: project Category: project
Slug: relearn Slug: relearn
lang: nl lang: nl
featured_image: ![relearn](/images/pg.jpg)
![test image](/images/pg.jpg) ![relearn](/images/pg.jpg)
Relearn is een week-lang collectief leer experiment met evenveel leraren als deelnemers. De collectieve studieweek zet parameters van/voor leren centraal, en zoekt manieren om deze te verplaatsen. Relearn is een week-lang collectief leer experiment met evenveel leraren als deelnemers. De collectieve studieweek zet parameters van/voor leren centraal, en zoekt manieren om deze te verplaatsen.

View File

@ -19,6 +19,8 @@ CATEGORY_FEED_ATOM = None
TRANSLATION_FEED_ATOM = None TRANSLATION_FEED_ATOM = None
AUTHOR_FEED_ATOM = None AUTHOR_FEED_ATOM = None
AUTHOR_FEED_RSS = None AUTHOR_FEED_RSS = None
FEED_ALL_RSS = 'feeds/all.rss.xml'
RSS_FEED_SUMMARY_ONLY = False
DEFAULT_PAGINATION = 25 DEFAULT_PAGINATION = 25

View File

@ -10,11 +10,10 @@ import sys
sys.path.append(os.curdir) sys.path.append(os.curdir)
from pelicanconf import * from pelicanconf import *
SITEURL = '' # SITEURL = 'http://www.centerforeveryday.technology'
RELATIVE_URLS = False RELATIVE_URLS = False
FEED_ALL_ATOM = 'feeds/all.atom.xml' # FEED_DOMAIN = SITEURL
CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
DELETE_OUTPUT_DIRECTORY = True DELETE_OUTPUT_DIRECTORY = True

View File

@ -1,53 +1,37 @@
@font-face{ @font-face{
font-family: 'NowBlack'; font-family: "cmu";
src: url('../fonts/Now-Black.otf') format('opentype'); src:url('../fonts/cmunorm.ttf');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face{ @font-face{
font-family: 'NowBold'; font-family: "biolinum";
src: url('../fonts/Now-Bold.otf') format('opentype'); src:url('../fonts/LinBiolinum_RB.otf');
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face{ @font-face{
font-family: 'NowLight'; font-family: "cmu";
src: url('../fonts/Now-Light.otf') format('opentype'); src:url('../fonts/cmunit.ttf');
font-weight: normal; font-weight: normal;
font-style: italic;
}
@font-face{
font-family: "cmu";
src:url('../fonts/cmuntb.ttf');
font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face{ @font-face{
font-family: 'NowMedium'; font-family: "cmu";
src: url('../fonts/Now-Medium.otf') format('opentype'); src:url('../fonts/cmuntx.ttf');
font-weight: normal; font-weight: bold;
font-style: normal; font-style: italic;
}
@font-face {
font-family: 'NowRegular';
src: url('../fonts/Now-Regular.otf') format('opentype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'NowThin';
src: url('../fonts/Now-Thin.otf') format('opentype');
font-weight: normal;
font-style: normal;
} }
@font-face{ @font-face{
font-family: "liberation"; font-family: "liberation";
src:url('../fonts/LiberationMono.ttf'); src:url('../fonts/LiberationMono.ttf');
} }
@font-face{
font-family: "Inconsolata";
src:url('../fonts/Inconsolata/Inconsolata.otf');
}
body{ body{
position: relative; position: relative;
width: calc(100% - 50px); width: calc(100% - 50px);
@ -56,14 +40,38 @@ body{
left:0px; left:0px;
margin:0 auto 5em auto; margin:0 auto 5em auto;
padding: 0px 15px; padding: 0px 15px;
font-family: "Inconsolata", monospace; font-family: "liberation", monospace;
font-size: 18px; font-size: 20px;
line-height:1.6; line-height:1.7;
font-style: normal; font-style: normal;
background-color: rgb(252, 255, 120); background-color: rgb(252, 255, 120);
color:black; color:black;
} }
header {
width:calc(100% - 50px);
margin-top:15px;
margin-bottom:4em;
padding-bottom:1em;
font-family: "liberation", monospace;
font-size: 12px;
line-height: 1.7;
letter-spacing: 0;
}
/*header {
width:calc(100% - 50px);
margin-top:15px;
padding-bottom:1em;
font-family: "biolinum", monospace;
font-size: 29px;
line-height: 1.5;
letter-spacing: 0;
}*/
#content{
margin-top:1em;
}
/****************************/
/* general elements */
a { a {
color:#7e5211; color:#7e5211;
} }
@ -89,7 +97,7 @@ ul {
} }
h1, h2, h3, h4, h5, h6, #header{ h1, h2, h3, h4, h5, h6, #header{
margin:0 0 0 0; margin:0;
padding:0; padding:0;
} }
h1{ h1{
@ -103,30 +111,32 @@ h1, h2, h3, h4, h5, h6, #header{
font-size: 100%; font-size: 100%;
font-weight: normal; font-weight: normal;
} }
p{
margin:0 0 1em 0;
}
em{
letter-spacing: 0;
}
pre{ pre{
line-height: 1.0; line-height: 1.0;
font-family: monospace; font-family: monospace;
} }
.paginator{ .paginator{
float:right; float:right;
margin:0px; margin:0px;
} }
#post-list { #post-list {
padding-left:0px; padding-left:0px;
margin-top:0px; margin-top:0px;
} }
/****************************/ /****************************/
/* header & #translation */ /* header & #translation */
#translation{ #translation{
position: absolute; position: absolute;
font-size: 14.8px; font-size: 12px;
top:-15px; top:-5px;
right:5px; right:5px;
margin:0; margin:0;
padding:0; padding:0;
@ -142,57 +152,34 @@ pre{
font-weight: bold; font-weight: bold;
} }
header {
width:calc(100% - 50px);
margin-top:1em;
line-height: 1.5em;
padding-bottom:1em;
}
#title p{
font-family: "Liberation", monospace;
font-size: 20px;
line-height: 1.7;
font-weight: normal;
/*font-family: "CompModern", monospace;
font-size: 24px;
line-height: 1.3;
font-weight: bold;*/
}
#title pre{
font-family: 'Inconsolata';
font-size: 12px;
line-height: 1.0;
float: left;
width: 200px;
height: 200px;
margin-right: 2em;
padding-right: 5px;
}
#content{
margin-top:1em;
}
/****************************/ /****************************/
/* main/index overview page */ /* main/index overview page */
#content #post-list{ #content #post-list{
width: 100%; width: 100%;
} }
.summary p{
display: inline;
}
.hentry{ .hentry{
float: left;
display: inline-block; display: inline-block;
width: 200px; width: 200px;
font-size: 14.8px; font-size: 12px;
line-height: 1.5; line-height: 1.6;
margin:0 2em 2em 0; margin:0 2em 2em 0;
padding:0; padding:0;
vertical-align: top;
} }
.hentry .article-info .entry-title{ .hentry .article-info .entry-title{
font-size: 120%; font-family: "biolinum";
font-weight: normal; font-size: 250%;
line-height: 1.1; font-weight: bold;
line-height: 0.95;
hyphens:auto;
}
.hentry .article-info .entry-title a{
text-decoration: none;
} }
/* ascii art styling */ /* ascii art styling */
.hentry pre{ .hentry pre{
font-size: 14.4px; font-size: 14.4px;
@ -215,13 +202,14 @@ header {
font-weight: bold; font-weight: bold;
} }
.entry-content{ .entry-content, #page-content{
width: 50%; width: 800px;
margin:0;
} }
.entry-content img, .summary img{ .entry-content img, .summary img, #page-content img{
max-width:100%; max-width:100%;
} }
.entry-content .seperator hr{ .entry-content .seperator hr, #page-content hr{
max-width: 50%; max-width: 50%;
} }
.post-info{ .post-info{
@ -234,29 +222,9 @@ header {
margin: 3px 0; margin: 3px 0;
} }
/****************************/
/* pages */
#page-content{
width: 50%;
margin:0 auto;
padding-top:1em;
}
#page-content p{
margin:0 0 28.8px 0; /* line height 1.8 = 28.8px */
}
#page-content img{
position: relative;
width:25%;
margin:0 -100% 15px 0;
float: right;
left:10px;
}
/****************************/ /****************************/
/* other */ /* other */
.highlight{ .highlight{
margin: auto; margin: auto;
max-width:800px; max-width:800px;

View File

@ -1,4 +1,4 @@
/*
pre .hll { pre .hll {
background-color: #ffffcc; background-color: #ffffcc;
} }
@ -435,3 +435,4 @@ pre .il {
color: #40a070; color: #40a070;
} }
*/

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,3 +1,6 @@
Copyright (c) 20032012, Philipp H. Poll (www.linuxlibertine.org | gillian at linuxlibertine.org),
with Reserved Font Name "Linux Libertine" and "Biolinum".
This Font Software is licensed under the SIL Open Font License, Version 1.1. This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

View File

@ -2,36 +2,11 @@
<html lang="{{ DEFAULT_LANG }}"> <html lang="{{ DEFAULT_LANG }}">
<head> <head>
{% block head %} {% block head %}
<title>{% block title %}{{ SITENAME }} - {{SITESUBTITLE}}{% endblock title %}</title> <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="{{ SITEURL}}/favicon.ico" type="image/x-icon"> <link rel="icon" href="{{ SITEURL}}/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="{{ SITEURL }}/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="{{ SITEURL }}/favicon.ico" type="image/x-icon">
{% if FEED_ALL_ATOM %}
<link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
{% endif %}
{% if FEED_ALL_RSS %}
<link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
{% endif %}
{% if FEED_ATOM %}
<link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
{% endif %}
{% if FEED_RSS %}
<link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
{% endif %}
{% if CATEGORY_FEED_ATOM and category %}
<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
{% endif %}
{% if CATEGORY_FEED_RSS and category %}
<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
{% endif %}
{% if TAG_FEED_ATOM and tag %}
<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
{% endif %}
{% if TAG_FEED_RSS and tag %}
<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
{% endif %}
{% from 'syndication.html' import syndication with context %} {% from 'syndication.html' import syndication with context %}
{{ syndication(article) }} {{ syndication(article) }}
@ -52,6 +27,10 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<br>
{% if FEED_ALL_RSS %}
<li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml"><i class="fa fa-rss "></i> RSS</a></li>
{% endif %}
</div> </div>
<header id="banner"> <header id="banner">
{% for p in pages %} {% for p in pages %}

View File

@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<section id="content"> <section id="content" class="index">
{% block content_title %} {% block content_title %}
{% endblock %} {% endblock %}
{% if articles_page.has_other_pages() %} {% if articles_page.has_other_pages() %}
@ -12,7 +12,7 @@
<div class="article-info"> <div class="article-info">
<span class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span> <span class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
</div> </div>
<div class="summary">{{ article.summary }}</div> <div class="summary">{{ article.summary }} <span><a href="{{ SITEURL }}/{{ article.url }}">read more</a></span></div>
<div class="separator"><hr></div> <div class="separator"><hr></div>
<div class="post-info"> <div class="post-info">
<time class="published" datetime="{{ article.date.isoformat() }}"> <time class="published" datetime="{{ article.date.isoformat() }}">