forked from varia/varia.website
Merge branch 'master' of https://git.vvvvvvaria.org/varia/varia.website
This commit is contained in:
Silvio
commit
464cd329e9
@ -40,18 +40,18 @@ EXTRA_PATH_METADATA = {
|
|||||||
'extra/htaccess': {'path': '.htaccess'}
|
'extra/htaccess': {'path': '.htaccess'}
|
||||||
}
|
}
|
||||||
|
|
||||||
THEME = 'themes/cetcat'
|
THEME = 'themes/varia'
|
||||||
THEME_STATIC_DIR = 'theme/'
|
THEME_STATIC_DIR = 'theme/'
|
||||||
|
|
||||||
I18N_SUBSITES = {
|
I18N_SUBSITES = {
|
||||||
'en': {
|
'en': {
|
||||||
'SITESUBTITLE':u'Centre for Everyday Technology',
|
'SITESUBTITLE':u'Centre for Everyday Technology',
|
||||||
'SITEURL':'varia.zone/en/',
|
'SITEURL':'varia.zone/en/',
|
||||||
'locale':'en_US.UTF-8'
|
'locale':'en_US.UTF-8'
|
||||||
},
|
},
|
||||||
'nl': {
|
'nl': {
|
||||||
'SITESUBTITLE':u'Centrum voor Alledaagse Technologie',
|
'SITESUBTITLE':u'Centrum voor Alledaagse Technologie',
|
||||||
'SITEURL':'varia.zone/',
|
'SITEURL':'varia.zone/',
|
||||||
'locale':'nl.UTF-8'
|
'locale':'nl.UTF-8'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,7 +10,7 @@ import sys
|
|||||||
sys.path.append(os.curdir)
|
sys.path.append(os.curdir)
|
||||||
from pelicanconf import *
|
from pelicanconf import *
|
||||||
|
|
||||||
RELATIVE_URLS = True
|
RELATIVE_URLS = False
|
||||||
DELETE_OUTPUT_DIRECTORY = True
|
DELETE_OUTPUT_DIRECTORY = True
|
||||||
|
|
||||||
# Following items are often useful when publishing
|
# Following items are often useful when publishing
|
||||||
|
|||||||
@ -40,7 +40,7 @@ body{
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height:1.8;
|
line-height:1.8;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
background-color: rgb(252, 255, 120);
|
background-color: rgba(252, 255, 120, .7);
|
||||||
color:black;
|
color:black;
|
||||||
}
|
}
|
||||||
header {
|
header {
|
||||||
@ -54,8 +54,8 @@ header {
|
|||||||
}
|
}
|
||||||
#content.index header{
|
#content.index header{
|
||||||
font-family: 'CMUconcrete';
|
font-family: 'CMUconcrete';
|
||||||
font-size: 26px;
|
font-size: 22px;
|
||||||
line-height: 1.6;
|
line-height: 1.4;
|
||||||
letter-spacing: .035em;
|
letter-spacing: .035em;
|
||||||
}
|
}
|
||||||
#content.index header em{
|
#content.index header em{
|
||||||
@ -159,6 +159,9 @@ pre{
|
|||||||
.summary p{
|
.summary p{
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
.summary.longread{
|
||||||
|
font-size: 150%;
|
||||||
|
}
|
||||||
.long-read .hentry{
|
.long-read .hentry{
|
||||||
width:calc(400px + 2em);
|
width:calc(400px + 2em);
|
||||||
}
|
}
|
||||||
@ -181,7 +184,7 @@ pre{
|
|||||||
font-size: 190%;
|
font-size: 190%;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
line-height: 1.10;
|
line-height: 1.10;
|
||||||
margin:0;
|
margin:0 0 .5em 0;
|
||||||
}
|
}
|
||||||
.hentry .article-info .entry-title a{
|
.hentry .article-info .entry-title a{
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
@ -189,14 +192,15 @@ pre{
|
|||||||
/* date */
|
/* date */
|
||||||
.event-details{
|
.event-details{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-family: 'CMUconcrete';
|
font-family: 'liberation';
|
||||||
font-size: 12px;
|
font-size: 10px;
|
||||||
margin:.5em 0 1em 0;
|
margin:.5em 0 0;
|
||||||
}
|
}
|
||||||
/* ascii art styling */
|
/* ascii art styling */
|
||||||
.hentry pre{
|
.hentry pre{
|
||||||
font-size: 14.4px;
|
font-size: 14.4px;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
clear:both; /*to prevent the ascii to break up*/
|
||||||
}
|
}
|
||||||
/* featured image */
|
/* featured image */
|
||||||
.hentry .article-info .featured-image img{
|
.hentry .article-info .featured-image img{
|
||||||
@ -246,7 +250,7 @@ pre{
|
|||||||
}
|
}
|
||||||
.entry-content-container, #page-content-container{
|
.entry-content-container, #page-content-container{
|
||||||
width: calc(100% - 285px);
|
width: calc(100% - 285px);
|
||||||
background-color: rgba(255,255,0,.3);
|
/*background-color: rgba(255,255,0,.3);*/
|
||||||
float: right;
|
float: right;
|
||||||
padding:30px;
|
padding:30px;
|
||||||
margin-bottom:25px;
|
margin-bottom:25px;
|
||||||
@ -1,18 +1,16 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<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 }} {{SITESUBTITLE}}{% 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">
|
||||||
|
|
||||||
{% from 'syndication.html' import syndication with context %}
|
{% from 'syndication.html' import syndication with context %}
|
||||||
{{ syndication(article) }}
|
{{ syndication(article) }}
|
||||||
|
<link rel="stylesheet" type="text/css" href="/{{ THEME_STATIC_DIR }}css/pygment.css" />
|
||||||
<link rel="stylesheet" type="text/css" href="/{{ THEME_STATIC_DIR }}css/pygment.css" />
|
<link rel="stylesheet" type="text/css" href="/{{ THEME_STATIC_DIR }}css/{{ CSS_FILE }}" />
|
||||||
<link rel="stylesheet" type="text/css" href="/{{ THEME_STATIC_DIR }}css/{{ CSS_FILE }}" />
|
{% endblock head %}
|
||||||
{% endblock head %}
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="index" class="home">
|
<body id="index" class="home">
|
||||||
@ -19,24 +19,26 @@
|
|||||||
<article class="hentry {{article.category}}">
|
<article class="hentry {{article.category}}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="article-info">
|
<div class="article-info">
|
||||||
<span class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
|
<div class="entry-title">
|
||||||
<div class="event-details">
|
<a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
|
||||||
{% if article.event_start %}
|
</div>
|
||||||
|
<div class="featured-image {{past}}">
|
||||||
|
{% if article.featured_image %}
|
||||||
|
<a href="{{ article.url }}"><img src="{{ article.featured_image }}"></a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% if article.event_start %}
|
||||||
|
<div class="event-details">
|
||||||
{{ article.event_start }}
|
{{ article.event_start }}
|
||||||
{% set past = '' %}
|
{% set past = '' %}
|
||||||
{% if article.event_start < article.date.now() %}
|
{% if article.event_start < article.date.now() %}
|
||||||
{% set past = ' past-event' %}
|
{% set past = ' past-event' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% endif %}
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
<div class="featured-image {{past}}">
|
|
||||||
{% if article.featured_image %}
|
|
||||||
<img src="{{ article.featured_image }}">
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="summary">{{ article.summary }}
|
<div class="summary {{ article.category }}">{{ article.summary }}
|
||||||
<span>
|
<span>
|
||||||
<a href="{{ article.url }}">
|
<a href="{{ article.url }}">
|
||||||
{% if DEFAULT_LANG == 'en' %}
|
{% if DEFAULT_LANG == 'en' %}
|
||||||
@ -47,6 +49,17 @@
|
|||||||
</a>
|
</a>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- <div class="summary {{ article.category }}">{{ article.summary }}
|
||||||
|
<span>
|
||||||
|
<a href="{{ article.url }}">
|
||||||
|
{% if DEFAULT_LANG == 'en' %}
|
||||||
|
read more
|
||||||
|
{% elif DEFAULT_LANG == 'nl' %}
|
||||||
|
lees meer
|
||||||
|
{% endif %}
|
||||||
|
</a>
|
||||||
|
</span>
|
||||||
|
</div> -->
|
||||||
<div class="separator"><hr></div>
|
<div class="separator"><hr></div>
|
||||||
<div class="post-info">
|
<div class="post-info">
|
||||||
{% if article.category %}
|
{% if article.category %}
|
||||||
@ -1,6 +1,15 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% block title %}{{ page.title }}{%endblock%}
|
{% block title %}{{ page.title }}{%endblock%}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
<section id="content" class="index">
|
||||||
|
<header id="banner">
|
||||||
|
{% for p in pages %}
|
||||||
|
{% if p.title == 'header' %}
|
||||||
|
<div id="title">{{ p.content }}</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
</header>
|
||||||
|
</section>
|
||||||
<div id="page-content">
|
<div id="page-content">
|
||||||
{{ page.content }}
|
{{ page.content }}
|
||||||
|
|
||||||
@ -5,7 +5,7 @@
|
|||||||
{# Thumbnail image to show when homepage is shared on social media. It also
|
{# Thumbnail image to show when homepage is shared on social media. It also
|
||||||
serves as the default image for posts whose featured_image is not set. #}
|
serves as the default image for posts whose featured_image is not set. #}
|
||||||
{% if not FEATURED_IMAGE %}
|
{% if not FEATURED_IMAGE %}
|
||||||
{% set FEATURED_IMAGE = '' %}
|
{% set FEATURED_IMAGE = 'https://varia.zone/images/de_varia.png' %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set FEATURED_IMAGE = FEATURED_IMAGE %}
|
{% set FEATURED_IMAGE = FEATURED_IMAGE %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -28,9 +28,16 @@ serves as the default image for posts whose featured_image is not set. #}
|
|||||||
<meta name="twitter:title" content="{{ article.title|striptags|e }} {%if article.subtitle %} - {{ article.subtitle|striptags|e }} {% endif %}">
|
<meta name="twitter:title" content="{{ article.title|striptags|e }} {%if article.subtitle %} - {{ article.subtitle|striptags|e }} {% endif %}">
|
||||||
<meta name="twitter:description" content="{{article.description|striptags|e}}">
|
<meta name="twitter:description" content="{{article.description|striptags|e}}">
|
||||||
{% if article.featured_image %}
|
{% if article.featured_image %}
|
||||||
<meta property="og:image" content="{{SITEURL}}{{article.featured_image}}" />
|
{% if I18N_SUBSITES %}
|
||||||
<meta property="og:image:secure_url" content="{{SITEURL}}{{article.featured_image}}" />
|
{% for lang, url in I18N_SUBSITES.items() %}
|
||||||
<meta name="twitter:image" content="{{SITEURL}}{{article.featured_image}}" >
|
{% if lang == 'en' %}
|
||||||
|
<!-- this is a dirty hack, FIXME -->
|
||||||
|
<meta property="og:image" content="http://varia.zone{{article.featured_image}}" />
|
||||||
|
<meta property="og:image:secure_url" content="https://varia.zone{{article.featured_image}}" />
|
||||||
|
<meta name="twitter:image" content="https://varia.zone{{article.featured_image}}" >
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if FEATURED_IMAGE %}
|
{% if FEATURED_IMAGE %}
|
||||||
<meta property="og:image" content="{{FEATURED_IMAGE}}" />
|
<meta property="og:image" content="{{FEATURED_IMAGE}}" />
|
||||||
Loading…
Reference in New Issue
Block a user