diff --git a/content/pages/about-en.md b/content/pages/about-en.md
index 60477a59a..00da4766c 100644
--- a/content/pages/about-en.md
+++ b/content/pages/about-en.md
@@ -4,4 +4,10 @@ Category: about
Slug: about
lang: en
-The Center of Everyday Technology is a Rotterdam based initiative that collects, conducts and instigates research and projects relating to the emerging developments in everyday technology. We aim to provide an environment where questions can be asked, opinions can be stated, projects can be developed and research can be conducted, both collectively and individually. Our goal is to become a hub for exchange and a source for resilience, within the city and beyond.
+# initiative
+The center of everyday technology is a Rotterdam based initiative that collects, conducts and instigates research and projects relating to the emerging developments in everyday technology. We aim to provide an environment where questions can be asked, opinions can be stated, projects can be developed and research can be conducted, both collectively and individually. Our goal is to become a hub for exchange and a source for resilience, within the city and beyond.
+
+# space
+Gouwstraat 3
+3082 BA, Rotterdam
+
diff --git a/content/pages/about-nl.md b/content/pages/about-nl.md
index d71230668..b73b889ea 100644
--- a/content/pages/about-nl.md
+++ b/content/pages/about-nl.md
@@ -4,4 +4,10 @@ Category: about
Slug: about
lang: nl
+# initiatief
Het centrum voor alledaagse technologie is een Rotterdamse initiatief dat werkt aan, met en door technologie. Gezamenlijk en individueel initiëren en verzamelen wij onderzoek naar nieuwe tendensen, organiseren collectieve leermomenten en ontwikkelen nieuwe projecten. Ons doel is om een sociale infrastructuur te creëren waar ruimte is voor vragen, meningen, ingrepen, hulp en actie. Wij willen een plek voor uitwisseling zijn, een stem in debatten bieden en een bron van weerbaarheid vormen.
+
+# ruimte
+Gouwstraat 3
+3082 BA, Rotterdam
+
diff --git a/content/pages/header-en.md b/content/pages/header-en.md
index 62f19e8ea..d45efd236 100644
--- a/content/pages/header-en.md
+++ b/content/pages/header-en.md
@@ -4,5 +4,25 @@ Category: about
Slug: header
lang: en
-This is the webpage for a yet-to-be-named center for everyday technology. The Rotterdam based initiative is focused on working [with, about and through technology](/en/category/project.html). At its core the initiative aims to be a [social infrastructure](/en/pages/about.html) from which to collaboratively facillitate [critical understandings](/en/category/curriculum.html) on the technologies that surround us. The initiative is a [membership-based oranisation](/en/pages/membership.html) striving to become a space for questions, opinions, modifications, help and action.
+
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+
+This is a monthly changing ASCII
+art board of 33 x 15 characters.
+
+This is the webpage for a *yet-to-be-named* center for everyday technology. The Rotterdam based initiative is focused on working [with, about and through technology](/en/category/project.html). At its core the initiative aims to be a [social infrastructure](/en/pages/about.html) from which to collaboratively facillitate [critical understandings](/en/category/curriculum.html) on the technologies that surround us. The initiative is a [membership-based oranisation](/en/pages/membership.html) striving to become a space for questions, opinions, modifications, help and action. Keep an eye on the agenda for [upcoming events](/en/).
diff --git a/content/pages/header-nl.md b/content/pages/header-nl.md
index b7296b521..7b419d295 100644
--- a/content/pages/header-nl.md
+++ b/content/pages/header-nl.md
@@ -4,5 +4,26 @@ Category: about
Slug: header
lang: nl
-Dit de pagina van een nog te benoemen centrum voor alledaagse technologie. Een collectief initiatief met een ruimte in Rotterdam dat zich richt op werk [aan, met en door technologie](/category/project.html). In de kern wil dit initiatief een [sociale infrastructuur](/pages/about.html) vormen van waaruit men gezamelijk [een critische relatie](/category/curriculum.html) tot de technologie van alledag aangaat. Op basis van [een lidmaatschapsmodel](/pages/membership.html) wil ze een ruimte bieden voor vragen, meningen, ingrepen, hulp en actie. Houd de agenda in de gaten voor [aankomende evenementen](/).
+
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+ASCIIASCIIASCIIASCIIASCIIASCII!!!
+
+Dit is een maandelijks variërend
+ASCII bord van 33 x 15 karakters.
+
+Dit de pagina van *een nog te benoemen* centrum voor alledaagse technologie. Een collectief initiatief met een ruimte in Rotterdam dat zich richt op werk [aan, met en door technologie](/category/project.html). In de kern wil dit initiatief een [sociale infrastructuur](/pages/about.html) vormen van waaruit men gezamelijk [een kritische relatie](/category/curriculum.html) tot de technologie van alledag aangaat. Op basis van [een lidmaatschapsmodel](/pages/membership.html) wil ze een ruimte bieden voor vragen, meningen, ingrepen, hulp en actie. Houd de agenda in de gaten voor [aankomende evenementen](/).
+
diff --git a/content/pages/membership-en.md b/content/pages/membership-en.md
index cf6ddb3a6..6ad840cf6 100644
--- a/content/pages/membership-en.md
+++ b/content/pages/membership-en.md
@@ -4,6 +4,14 @@ Category: about
Slug: membership
lang: en
-CAT/CET will function on a membership basis: each member can initiate or organize a weekly, monthly or spontaneous session around a shared topic of interest. By creating an open space to initiate, a changing flow of meetings will be organized and being available for participation to other members.
+The **center for everyday technology** will function on a membership basis: each member can initiate or organize a weekly, monthly or spontaneous session around a shared topic of interest. By creating an open space to initiate, a changing flow of meetings will be organized and being available for participation to other members.
-The CAT/CET space functions as a working and meeting place where members meet during organized events or accidental encounters, and where non-members are welcome to join.
+The space at the Gouwstraat functions as a working and meeting place where members meet during organized events or accidental encounters, and where non-members are welcome to join.
+
+# members
+Danny van der Kleij (core member),
+Dennis de Bel (core member),
+Lídia Pereira (core member),
+Manetta Berends (core member),
+Niek Hilkmann (core member),
+Roel Roscam Abbing (core member)
diff --git a/content/pages/membership-nl.md b/content/pages/membership-nl.md
index 9dd5ec078..bae3db528 100644
--- a/content/pages/membership-nl.md
+++ b/content/pages/membership-nl.md
@@ -4,6 +4,14 @@ Category: about
Slug: membership
lang: nl
-CAT/CET werkt met een ledenmodel. Deze vorm biedt de mogelijkheid om leden te binden aan de organisatie en deze uit te breiden. Deze leden betalen een maandelijkse vaste bijdrage en kunnen in ruil daarvoor deelnemen aan de activiteiten die worden georganiseerd. Hierdoor kunnen binnen de vereniging verschillende interessegroepen ontstaan. Naast de mogelijkheid van het organiseren van zulke clubavonden, thematische sessies of bijeenkomsten heeft CAT/CET een vast publiek programma dat gericht is op een breder netwerk.
+Het **centrum voor alledaagse technologie** werkt met een ledenmodel. Deze vorm biedt de mogelijkheid om leden te binden aan de organisatie en deze uit te breiden. Deze leden betalen een maandelijkse vaste bijdrage en kunnen in ruil daarvoor deelnemen aan de activiteiten die worden georganiseerd. Hierdoor kunnen binnen de vereniging verschillende interessegroepen ontstaan. Naast de mogelijkheid van het organiseren van zulke clubavonden, thematische sessies of bijeenkomsten heeft het **centrum voor alledaagse technologie** een vast publiek programma dat gericht is op een breder netwerk.
-De ruimte van CAT/CET functioneert als een werk- en ontmoetingsplek, waar leden elkaar ontmoeten tijdens georganiseerde evenementen of spontane ontmoetingen en niet-leden welkom zijn om aan te sluiten en lid te worden.
+De ruimte aan de Gouwstraat functioneert als een werk- en ontmoetingsplek, waar leden elkaar ontmoeten tijdens georganiseerde evenementen of spontane ontmoetingen en niet-leden welkom zijn om aan te sluiten en lid te worden.
+
+# leden
+Danny van der Kleij (kernlid),
+Dennis de Bel (kernlid),
+Lídia Pereira (kernlid),
+Manetta Berends (kernlid),
+Niek Hilkmann (kernlid),
+Roel Roscam Abbing (kernlid)
diff --git a/content/relearn.md b/content/relearn.md
index f929abca4..c07ee398b 100644
--- a/content/relearn.md
+++ b/content/relearn.md
@@ -10,7 +10,7 @@ Relearn is een week-lang collectief leer experiment met evenveel leraren als dee
Tijdens Relearn werken we met een reeks case studies, waarnemingen, vragen, of stapels studiemateriaal die als "tracks" de structuur van de week vormen. Relearn omarmt het resetten van denkmodi, om een uiteenlopende reeks aanpakken te heroverwegen, die voortkomen uit de ontwikkeling van onze culturen tot en via digitale entiteiten.
-Naast een experiment in collectief leren, is Relearn ontstaan vanuit een interesse in Vrije en Open Source Software-cultuur en -praktijken als een manier om de productieprocessen en -kaders van technologie en cultuur te ondervragen..
+Naast een experiment in collectief leren, is Relearn ontstaan vanuit een interesse in Vrije en Open Source Software-cultuur en -praktijken als een manier om de productieprocessen en -kaders van technologie en cultuur te ondervragen.
29 Augustus - 2 September 2017
Poortgebouw, Rotterdam
diff --git a/pelicanconf.py b/pelicanconf.py
index 22409add1..f7b36183f 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -36,7 +36,7 @@ DEFAULT_PAGINATION = 25
#RELATIVE_URLS = True
PLUGIN_PATHS = ['./plugins']
-PLUGINS = ['extract_toc', 'i18n_subsites']
+PLUGINS = ['extract_toc', 'i18n_subsites', 'summary']
MD_EXTENSIONS = ['codehilite','extra','smarty', 'toc']
STATIC_PATHS = ['extra', 'images', 'pdfs']
@@ -46,11 +46,6 @@ EXTRA_PATH_METADATA = {
'extra/htaccess': {'path': '.htaccess'}
}
-MENUITEMS=(
- # adds extra menu items, the others are automatically generated as pages
- ('log', '/'),
- )
-
THEME = 'themes/cetcat'
# ARTICLE_LANG_URL = '{slug}-{lang}.html'
diff --git a/themes/cetcat/static/css/main.css b/themes/cetcat/static/css/main.css
index 8e7bff8df..16a7c6e54 100644
--- a/themes/cetcat/static/css/main.css
+++ b/themes/cetcat/static/css/main.css
@@ -43,6 +43,10 @@
font-family: "liberation";
src:url('../fonts/LiberationMono.ttf');
}
+@font-face{
+ font-family: "Inconsolata";
+ src:url('../fonts/Inconsolata/Inconsolata.otf');
+ }
body{
position: relative;
@@ -52,10 +56,10 @@ body{
left:0px;
margin:0 auto 5em auto;
padding: 0px 15px;
- font-family: monospace, "liberation";
- font-size: 16px;
- line-height:1.8;
- font-style: normal;
+ font-family: "Inconsolata", monospace;
+ font-size: 18px;
+ line-height:1.6;
+ font-style: normal;
background-color: rgb(252, 255, 120);
color:black;
}
@@ -85,10 +89,20 @@ ul {
}
h1, h2, h3, h4, h5, h6, #header{
- font-family: "liberation", monospace;
margin:0 0 0 0;
padding:0;
}
+ h1{
+ font-size: 100%;
+ }
+ h2{
+ font-size: 100%;
+ font-weight: normal;
+ text-decoration: underline; }
+ h3{
+ font-size: 100%;
+ font-weight: normal;
+ }
pre{
line-height: 1.0;
@@ -111,7 +125,7 @@ pre{
#translation{
position: absolute;
- font-size: 12px;
+ font-size: 14.8px;
top:-15px;
right:5px;
margin:0;
@@ -134,10 +148,25 @@ header {
line-height: 1.5em;
padding-bottom:1em;
}
- #title{
- font-family: "liberation", monospace;
- font-size: 22px;
- line-height: 1.5;
+ #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;
@@ -153,22 +182,26 @@ header {
float: left;
display: inline-block;
width: 200px;
- font-size: 12px;
- line-height: 1.7;
+ font-size: 14.8px;
+ line-height: 1.5;
margin:0 2em 2em 0;
padding:0;
}
.hentry .article-info .entry-title{
- font-family: "liberation", monospace;
font-size: 120%;
font-weight: normal;
+ line-height: 1.1;
+ }
+ /* ascii art styling */
+ .hentry pre{
+ font-size: 14.4px;
+ font-weight: normal;
}
/****************************/
/* article */
.article-info{
- max-width: 672px;
margin-bottom:1em;
}
.article-info .post-info time sup{
@@ -177,14 +210,13 @@ header {
.article-info .entry-title{
width:100%;
display:inline-block;
- font-family: "liberation", monospace;
font-size: 22px;
line-height: 1.5;
font-weight: bold;
}
.entry-content{
- max-width: 672px;
+ width: 50%;
}
.entry-content img, .summary img{
max-width:100%;
@@ -193,7 +225,7 @@ header {
max-width: 50%;
}
.post-info{
- font-size: 12px;
+ font-size: 13px;
}
.post-info sup{
font-size: 100%;
@@ -229,7 +261,7 @@ header {
}
.divider {
- font-size:12px;
+ font-size:14.8px;
width:100%;
line-height:1em;
background-color:white;
diff --git a/themes/cetcat/static/fonts/Inconsolata/Inconsolata.otf b/themes/cetcat/static/fonts/Inconsolata/Inconsolata.otf
new file mode 100644
index 000000000..e7e1fa0cd
Binary files /dev/null and b/themes/cetcat/static/fonts/Inconsolata/Inconsolata.otf differ
diff --git a/themes/cetcat/static/fonts/Inconsolata/SIL Open Font License.txt b/themes/cetcat/static/fonts/Inconsolata/SIL Open Font License.txt
new file mode 100644
index 000000000..14c043d60
--- /dev/null
+++ b/themes/cetcat/static/fonts/Inconsolata/SIL Open Font License.txt
@@ -0,0 +1,41 @@
+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
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/themes/cetcat/static/fonts/cmunit.ttf b/themes/cetcat/static/fonts/cmunit.ttf
new file mode 100644
index 000000000..2afa178f3
Binary files /dev/null and b/themes/cetcat/static/fonts/cmunit.ttf differ
diff --git a/themes/cetcat/static/fonts/cmunorm.ttf b/themes/cetcat/static/fonts/cmunorm.ttf
new file mode 100644
index 000000000..72cfd4221
Binary files /dev/null and b/themes/cetcat/static/fonts/cmunorm.ttf differ
diff --git a/themes/cetcat/static/fonts/cmuntb.ttf b/themes/cetcat/static/fonts/cmuntb.ttf
new file mode 100644
index 000000000..fa687ae63
Binary files /dev/null and b/themes/cetcat/static/fonts/cmuntb.ttf differ
diff --git a/themes/cetcat/static/fonts/cmuntt.ttf b/themes/cetcat/static/fonts/cmuntt.ttf
new file mode 100644
index 000000000..d975a18fd
Binary files /dev/null and b/themes/cetcat/static/fonts/cmuntt.ttf differ
diff --git a/themes/cetcat/static/fonts/cmuntx.ttf b/themes/cetcat/static/fonts/cmuntx.ttf
new file mode 100644
index 000000000..2060c30db
Binary files /dev/null and b/themes/cetcat/static/fonts/cmuntx.ttf differ
diff --git a/themes/cetcat/static/fonts/cmunvi.ttf b/themes/cetcat/static/fonts/cmunvi.ttf
new file mode 100644
index 000000000..288f91d35
Binary files /dev/null and b/themes/cetcat/static/fonts/cmunvi.ttf differ
diff --git a/themes/cetcat/static/fonts/cmunvt.ttf b/themes/cetcat/static/fonts/cmunvt.ttf
new file mode 100644
index 000000000..57bcaf45f
Binary files /dev/null and b/themes/cetcat/static/fonts/cmunvt.ttf differ
diff --git a/themes/cetcat/templates/base.html b/themes/cetcat/templates/base.html
index e4696a473..c5f8cb1cf 100644
--- a/themes/cetcat/templates/base.html
+++ b/themes/cetcat/templates/base.html
@@ -54,11 +54,11 @@
{% endif %}
- {% for p in pages %}
- {% if p.title == 'header' %}
- {{ p.content }}
- {% endif %}
- {% endfor %}
+ {% for p in pages %}
+ {% if p.title == 'header' %}
+ {{ p.content }}
+ {% endif %}
+ {% endfor %}
{% block content %}