diff --git a/pelicanconf.py b/pelicanconf.py index e3dc0c434b..9d76ac4ec9 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -40,18 +40,18 @@ EXTRA_PATH_METADATA = { 'extra/htaccess': {'path': '.htaccess'} } -THEME = 'themes/cetcat' +THEME = 'themes/varia' THEME_STATIC_DIR = 'theme/' I18N_SUBSITES = { 'en': { 'SITESUBTITLE':u'Centre for Everyday Technology', - 'SITEURL':'varia.zone/en/', + 'SITEURL':'varia.zone/en/', 'locale':'en_US.UTF-8' }, 'nl': { 'SITESUBTITLE':u'Centrum voor Alledaagse Technologie', - 'SITEURL':'varia.zone/', + 'SITEURL':'varia.zone/', 'locale':'nl.UTF-8' } } diff --git a/publishconf.py b/publishconf.py index fa91ccb817..79b371b205 100644 --- a/publishconf.py +++ b/publishconf.py @@ -10,7 +10,7 @@ import sys sys.path.append(os.curdir) from pelicanconf import * -RELATIVE_URLS = True +RELATIVE_URLS = False DELETE_OUTPUT_DIRECTORY = True # Following items are often useful when publishing diff --git a/themes/cetcat/static/css/main.css b/themes/varia/static/css/main.css similarity index 94% rename from themes/cetcat/static/css/main.css rename to themes/varia/static/css/main.css index 07c0721b3d..47719212cb 100644 --- a/themes/cetcat/static/css/main.css +++ b/themes/varia/static/css/main.css @@ -40,7 +40,7 @@ body{ font-size: 16px; line-height:1.8; font-style: normal; - background-color: rgb(252, 255, 120); + background-color: rgba(252, 255, 120, .7); color:black; } header { @@ -54,8 +54,8 @@ header { } #content.index header{ font-family: 'CMUconcrete'; - font-size: 26px; - line-height: 1.6; + font-size: 22px; + line-height: 1.4; letter-spacing: .035em; } #content.index header em{ @@ -159,6 +159,9 @@ pre{ .summary p{ display: inline; } + .summary.longread{ + font-size: 150%; + } .long-read .hentry{ width:calc(400px + 2em); } @@ -181,7 +184,7 @@ pre{ font-size: 190%; font-weight: bold; line-height: 1.10; - margin:0; + margin:0 0 .5em 0; } .hentry .article-info .entry-title a{ text-decoration: none; @@ -189,14 +192,15 @@ pre{ /* date */ .event-details{ width: 100%; - font-family: 'CMUconcrete'; - font-size: 12px; - margin:.5em 0 1em 0; + font-family: 'liberation'; + font-size: 10px; + margin:.5em 0 0; } /* ascii art styling */ .hentry pre{ font-size: 14.4px; font-weight: normal; + clear:both; /*to prevent the ascii to break up*/ } /* featured image */ .hentry .article-info .featured-image img{ @@ -246,7 +250,7 @@ pre{ } .entry-content-container, #page-content-container{ width: calc(100% - 285px); - background-color: rgba(255,255,0,.3); + /*background-color: rgba(255,255,0,.3);*/ float: right; padding:30px; margin-bottom:25px; diff --git a/themes/cetcat/static/css/pygment.css b/themes/varia/static/css/pygment.css similarity index 100% rename from themes/cetcat/static/css/pygment.css rename to themes/varia/static/css/pygment.css diff --git a/themes/cetcat/static/fonts/LiberationMono.ttf b/themes/varia/static/fonts/LiberationMono.ttf similarity index 100% rename from themes/cetcat/static/fonts/LiberationMono.ttf rename to themes/varia/static/fonts/LiberationMono.ttf diff --git a/themes/cetcat/static/fonts/cmunit.ttf b/themes/varia/static/fonts/cmunit.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunit.ttf rename to themes/varia/static/fonts/cmunit.ttf diff --git a/themes/cetcat/static/fonts/cmunobx.ttf b/themes/varia/static/fonts/cmunobx.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunobx.ttf rename to themes/varia/static/fonts/cmunobx.ttf diff --git a/themes/cetcat/static/fonts/cmunorm.ttf b/themes/varia/static/fonts/cmunorm.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunorm.ttf rename to themes/varia/static/fonts/cmunorm.ttf diff --git a/themes/cetcat/static/fonts/cmunssdc.ttf b/themes/varia/static/fonts/cmunssdc.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunssdc.ttf rename to themes/varia/static/fonts/cmunssdc.ttf diff --git a/themes/cetcat/static/fonts/cmuntb.ttf b/themes/varia/static/fonts/cmuntb.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmuntb.ttf rename to themes/varia/static/fonts/cmuntb.ttf diff --git a/themes/cetcat/static/fonts/cmuntt.ttf b/themes/varia/static/fonts/cmuntt.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmuntt.ttf rename to themes/varia/static/fonts/cmuntt.ttf diff --git a/themes/cetcat/static/fonts/cmuntx.ttf b/themes/varia/static/fonts/cmuntx.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmuntx.ttf rename to themes/varia/static/fonts/cmuntx.ttf diff --git a/themes/cetcat/static/fonts/cmunvi.ttf b/themes/varia/static/fonts/cmunvi.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunvi.ttf rename to themes/varia/static/fonts/cmunvi.ttf diff --git a/themes/cetcat/static/fonts/cmunvt.ttf b/themes/varia/static/fonts/cmunvt.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunvt.ttf rename to themes/varia/static/fonts/cmunvt.ttf diff --git a/themes/cetcat/static/js/stars.js b/themes/varia/static/js/stars.js similarity index 100% rename from themes/cetcat/static/js/stars.js rename to themes/varia/static/js/stars.js diff --git a/themes/cetcat/templates/archives.html b/themes/varia/templates/archives.html similarity index 100% rename from themes/cetcat/templates/archives.html rename to themes/varia/templates/archives.html diff --git a/themes/cetcat/templates/article.html b/themes/varia/templates/article.html similarity index 100% rename from themes/cetcat/templates/article.html rename to themes/varia/templates/article.html diff --git a/themes/cetcat/templates/author.html b/themes/varia/templates/author.html similarity index 100% rename from themes/cetcat/templates/author.html rename to themes/varia/templates/author.html diff --git a/themes/cetcat/templates/authors.html b/themes/varia/templates/authors.html similarity index 100% rename from themes/cetcat/templates/authors.html rename to themes/varia/templates/authors.html diff --git a/themes/cetcat/templates/base.html b/themes/varia/templates/base.html similarity index 73% rename from themes/cetcat/templates/base.html rename to themes/varia/templates/base.html index 80abaf2c1c..d5c913b398 100644 --- a/themes/cetcat/templates/base.html +++ b/themes/varia/templates/base.html @@ -1,18 +1,16 @@ - {% block head %} - {% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %} - +{% block head %} + {% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %} + - - + {% from 'syndication.html' import syndication with context %} {{ syndication(article) }} - - - - {% endblock head %} + + +{% endblock head %} diff --git a/themes/cetcat/templates/categories.html b/themes/varia/templates/categories.html similarity index 100% rename from themes/cetcat/templates/categories.html rename to themes/varia/templates/categories.html diff --git a/themes/cetcat/templates/category.html b/themes/varia/templates/category.html similarity index 100% rename from themes/cetcat/templates/category.html rename to themes/varia/templates/category.html diff --git a/themes/cetcat/templates/events_list.html b/themes/varia/templates/events_list.html similarity index 100% rename from themes/cetcat/templates/events_list.html rename to themes/varia/templates/events_list.html diff --git a/themes/cetcat/templates/gosquared.html b/themes/varia/templates/gosquared.html similarity index 100% rename from themes/cetcat/templates/gosquared.html rename to themes/varia/templates/gosquared.html diff --git a/themes/cetcat/templates/index.html b/themes/varia/templates/index.html similarity index 71% rename from themes/cetcat/templates/index.html rename to themes/varia/templates/index.html index 4b087798e8..7488b18671 100644 --- a/themes/cetcat/templates/index.html +++ b/themes/varia/templates/index.html @@ -19,24 +19,26 @@
{% endif %}
- {{ article.title }} -
- {% if article.event_start %} +
+ {{ article.title }} +
+ + {% if article.event_start %} +
{{ article.event_start }} {% set past = '' %} {% if article.event_start < article.date.now() %} {% set past = ' past-event' %} {% endif %} - {% endif %} -
- +
+ {% endif %}
-
{{ article.summary }} + +