diff --git a/content/relearn.md b/content/relearn.md index c07ee398b..e0ba425b4 100644 --- a/content/relearn.md +++ b/content/relearn.md @@ -3,8 +3,9 @@ Date: 2017-08-29 Category: project Slug: relearn 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. diff --git a/pelicanconf.py b/pelicanconf.py index 89863e487..9a1674711 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -19,6 +19,8 @@ CATEGORY_FEED_ATOM = None TRANSLATION_FEED_ATOM = None AUTHOR_FEED_ATOM = None AUTHOR_FEED_RSS = None +FEED_ALL_RSS = 'feeds/all.rss.xml' +RSS_FEED_SUMMARY_ONLY = False DEFAULT_PAGINATION = 25 diff --git a/publishconf.py b/publishconf.py index 85ff8ef69..6bc30205d 100644 --- a/publishconf.py +++ b/publishconf.py @@ -10,11 +10,10 @@ import sys sys.path.append(os.curdir) from pelicanconf import * -SITEURL = '' +# SITEURL = 'http://www.centerforeveryday.technology' RELATIVE_URLS = False -FEED_ALL_ATOM = 'feeds/all.atom.xml' -CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml' +# FEED_DOMAIN = SITEURL DELETE_OUTPUT_DIRECTORY = True diff --git a/themes/cetcat/static/css/main.css b/themes/cetcat/static/css/main.css index 2c3fdcb8f..1f4d0c28d 100644 --- a/themes/cetcat/static/css/main.css +++ b/themes/cetcat/static/css/main.css @@ -1,53 +1,37 @@ -@font-face { - font-family: 'NowBlack'; - src: url('../fonts/Now-Black.otf') format('opentype'); +@font-face{ + font-family: "cmu"; + src:url('../fonts/cmunorm.ttf'); font-weight: normal; font-style: normal; - } - -@font-face { - font-family: 'NowBold'; - src: url('../fonts/Now-Bold.otf') format('opentype'); +} +@font-face{ + font-family: "biolinum"; + src:url('../fonts/LinBiolinum_RB.otf'); font-weight: bold; font-style: normal; - } - -@font-face { - font-family: 'NowLight'; - src: url('../fonts/Now-Light.otf') format('opentype'); - font-weight: normal; - font-style: normal; - } - -@font-face { - font-family: 'NowMedium'; - src: url('../fonts/Now-Medium.otf') format('opentype'); - font-weight: normal; - font-style: normal; - } - -@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-face{ + font-family: "cmu"; + src:url('../fonts/cmunit.ttf'); font-weight: normal; + font-style: italic; +} +@font-face{ + font-family: "cmu"; + src:url('../fonts/cmuntb.ttf'); + font-weight: bold; font-style: normal; - } +} +@font-face{ + font-family: "cmu"; + src:url('../fonts/cmuntx.ttf'); + font-weight: bold; + font-style: italic; +} @font-face{ font-family: "liberation"; src:url('../fonts/LiberationMono.ttf'); - } -@font-face{ - font-family: "Inconsolata"; - src:url('../fonts/Inconsolata/Inconsolata.otf'); - } - +} body{ position: relative; width: calc(100% - 50px); @@ -56,14 +40,38 @@ body{ left:0px; margin:0 auto 5em auto; padding: 0px 15px; - font-family: "Inconsolata", monospace; - font-size: 18px; - line-height:1.6; + font-family: "liberation", monospace; + font-size: 20px; + line-height:1.7; font-style: normal; background-color: rgb(252, 255, 120); 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 { color:#7e5211; } @@ -89,7 +97,7 @@ ul { } h1, h2, h3, h4, h5, h6, #header{ - margin:0 0 0 0; + margin:0; padding:0; } h1{ @@ -103,30 +111,32 @@ h1, h2, h3, h4, h5, h6, #header{ font-size: 100%; font-weight: normal; } - +p{ + margin:0 0 1em 0; +} +em{ + letter-spacing: 0; +} pre{ line-height: 1.0; font-family: monospace; } - .paginator{ float:right; margin:0px; } - #post-list { padding-left:0px; margin-top:0px; } - /****************************/ /* header & #translation */ #translation{ position: absolute; - font-size: 14.8px; - top:-15px; + font-size: 12px; + top:-5px; right:5px; margin:0; padding:0; @@ -142,57 +152,34 @@ pre{ 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 */ #content #post-list{ width: 100%; } +.summary p{ + display: inline; +} .hentry{ - float: left; display: inline-block; width: 200px; - font-size: 14.8px; - line-height: 1.5; + font-size: 12px; + line-height: 1.6; margin:0 2em 2em 0; padding:0; + vertical-align: top; } .hentry .article-info .entry-title{ - font-size: 120%; - font-weight: normal; - line-height: 1.1; + font-family: "biolinum"; + font-size: 250%; + font-weight: bold; + line-height: 0.95; + hyphens:auto; + } + .hentry .article-info .entry-title a{ + text-decoration: none; } - /* ascii art styling */ .hentry pre{ font-size: 14.4px; @@ -215,13 +202,14 @@ header { font-weight: bold; } -.entry-content{ - width: 50%; +.entry-content, #page-content{ + width: 800px; + margin:0; } - .entry-content img, .summary img{ + .entry-content img, .summary img, #page-content img{ max-width:100%; } - .entry-content .seperator hr{ + .entry-content .seperator hr, #page-content hr{ max-width: 50%; } .post-info{ @@ -234,29 +222,9 @@ header { 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 */ - .highlight{ margin: auto; max-width:800px; diff --git a/themes/cetcat/static/css/pygment.css b/themes/cetcat/static/css/pygment.css index ab96d84a6..ec8a77a6f 100644 --- a/themes/cetcat/static/css/pygment.css +++ b/themes/cetcat/static/css/pygment.css @@ -1,4 +1,4 @@ - +/* pre .hll { background-color: #ffffcc; } @@ -435,3 +435,4 @@ pre .il { color: #40a070; } +*/ \ No newline at end of file diff --git a/themes/cetcat/static/fonts/Inconsolata/Inconsolata.otf b/themes/cetcat/static/fonts/Inconsolata/Inconsolata.otf deleted file mode 100644 index e7e1fa0cd..000000000 Binary files a/themes/cetcat/static/fonts/Inconsolata/Inconsolata.otf and /dev/null differ diff --git a/themes/cetcat/static/fonts/LinBiolinum_R.otf b/themes/cetcat/static/fonts/LinBiolinum_R.otf new file mode 100644 index 000000000..ada588011 Binary files /dev/null and b/themes/cetcat/static/fonts/LinBiolinum_R.otf differ diff --git a/themes/cetcat/static/fonts/LinBiolinum_RB.otf b/themes/cetcat/static/fonts/LinBiolinum_RB.otf new file mode 100644 index 000000000..d86721e82 Binary files /dev/null and b/themes/cetcat/static/fonts/LinBiolinum_RB.otf differ diff --git a/themes/cetcat/static/fonts/LinBiolinum_RI.otf b/themes/cetcat/static/fonts/LinBiolinum_RI.otf new file mode 100644 index 000000000..86d0cf430 Binary files /dev/null and b/themes/cetcat/static/fonts/LinBiolinum_RI.otf differ diff --git a/themes/cetcat/static/fonts/Now-Black.otf b/themes/cetcat/static/fonts/Now-Black.otf deleted file mode 100644 index 230c97d05..000000000 Binary files a/themes/cetcat/static/fonts/Now-Black.otf and /dev/null differ diff --git a/themes/cetcat/static/fonts/Now-Bold.otf b/themes/cetcat/static/fonts/Now-Bold.otf deleted file mode 100644 index bc28416e9..000000000 Binary files a/themes/cetcat/static/fonts/Now-Bold.otf and /dev/null differ diff --git a/themes/cetcat/static/fonts/Now-Light.otf b/themes/cetcat/static/fonts/Now-Light.otf deleted file mode 100644 index 6383e85fb..000000000 Binary files a/themes/cetcat/static/fonts/Now-Light.otf and /dev/null differ diff --git a/themes/cetcat/static/fonts/Now-Medium.otf b/themes/cetcat/static/fonts/Now-Medium.otf deleted file mode 100644 index 49aeb0654..000000000 Binary files a/themes/cetcat/static/fonts/Now-Medium.otf and /dev/null differ diff --git a/themes/cetcat/static/fonts/Now-Regular.otf b/themes/cetcat/static/fonts/Now-Regular.otf deleted file mode 100644 index 97a83432a..000000000 Binary files a/themes/cetcat/static/fonts/Now-Regular.otf and /dev/null differ diff --git a/themes/cetcat/static/fonts/Now-Thin.otf b/themes/cetcat/static/fonts/Now-Thin.otf deleted file mode 100644 index 112a51587..000000000 Binary files a/themes/cetcat/static/fonts/Now-Thin.otf and /dev/null differ diff --git a/themes/cetcat/static/fonts/Inconsolata/SIL Open Font License.txt b/themes/cetcat/static/fonts/SIL Open Font License.txt similarity index 96% rename from themes/cetcat/static/fonts/Inconsolata/SIL Open Font License.txt rename to themes/cetcat/static/fonts/SIL Open Font License.txt index 14c043d60..8d8757cd0 100644 --- a/themes/cetcat/static/fonts/Inconsolata/SIL Open Font License.txt +++ b/themes/cetcat/static/fonts/SIL Open Font License.txt @@ -1,3 +1,6 @@ +Copyright (c) 2003–2012, 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 license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL diff --git a/themes/cetcat/templates/base.html b/themes/cetcat/templates/base.html index c5f8cb1cf..059cf61d2 100644 --- a/themes/cetcat/templates/base.html +++ b/themes/cetcat/templates/base.html @@ -2,35 +2,10 @@ {% block head %} - {% block title %}{{ SITENAME }} - {{SITESUBTITLE}}{% endblock title %} + {% block title %}{{ SITENAME }}{% endblock title %} - - {% if FEED_ALL_ATOM %} - - {% endif %} - {% if FEED_ALL_RSS %} - - {% endif %} - {% if FEED_ATOM %} - - {% endif %} - {% if FEED_RSS %} - - {% endif %} - {% if CATEGORY_FEED_ATOM and category %} - - {% endif %} - {% if CATEGORY_FEED_RSS and category %} - - {% endif %} - {% if TAG_FEED_ATOM and tag %} - - {% endif %} - {% if TAG_FEED_RSS and tag %} - - {% endif %} {% from 'syndication.html' import syndication with context %} {{ syndication(article) }} @@ -52,6 +27,10 @@ {% endif %} {% endfor %} {% endif %} +
+ {% if FEED_ALL_RSS %} +
  • RSS
    • + {% endif %}