From 1fe3973d53082e26557cc9ceb6a7a111d3c94de3 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Tue, 6 Mar 2018 21:42:19 +0100 Subject: [PATCH] work in progress to add the stream plugin to the website --- pelicanconf.py | 5 ++- plugins-custom | 2 +- themes/varia/static/css/main.css | 53 +++++++------------------ themes/varia/templates/page.html | 21 ++++++---- themes/varia/templates/streamsssss.html | 15 +++++++ 5 files changed, 47 insertions(+), 49 deletions(-) create mode 100644 themes/varia/templates/streamsssss.html diff --git a/pelicanconf.py b/pelicanconf.py index fafeaaccd..3793da583 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -27,11 +27,10 @@ AUTHOR_FEED_ATOM = None AUTHOR_FEED_RSS = None DEFAULT_PAGINATION = 25 -# DEFAULT_DATE_FORMAT = '%a %d %B %Y' # Uncomment following line if you want document-relative URLs when developing PLUGIN_PATHS = ['./pelican-plugins', './plugins-custom'] -PLUGINS = ['dateish', 'extract_toc', 'i18n_subsites', 'summary', 'events-ics','complex_footnotes'] +PLUGINS = ['dateish', 'extract_toc', 'i18n_subsites', 'summary', 'events-ics','complex_footnotes', 'stream'] MD_EXTENSIONS = ['codehilite','extra','toc'] STATIC_PATHS = ['extra/favicon.ico', 'images', 'pdfs', 'stream'] @@ -63,3 +62,5 @@ PLUGIN_EVENTS = { } DATEISH_PROPERTIES = ['event_start', 'event_end'] + + diff --git a/plugins-custom b/plugins-custom index d91a9e910..abb64b784 160000 --- a/plugins-custom +++ b/plugins-custom @@ -1 +1 @@ -Subproject commit d91a9e910bffb850ecb597f5c77241678f197e24 +Subproject commit abb64b784e8fda8eb8628c32aa6c50dece37437a diff --git a/themes/varia/static/css/main.css b/themes/varia/static/css/main.css index 18a3a2bfa..8f365432a 100644 --- a/themes/varia/static/css/main.css +++ b/themes/varia/static/css/main.css @@ -1,35 +1,29 @@ -@font-face{ - font-family: "cmusans"; - src:url('../fonts/cmunssdc.ttf'); - font-weight: normal; - font-style: normal; -} @font-face{ font-family: "header"; - src:url('../fonts/CourierCode-Roman.ttf'); + src:url('../fonts/cmunssdc.ttf'); font-weight: normal; font-style: normal; } @font-face{ - font-family: "brood"; + font-family: "main"; src:url('../fonts/CourierCode-Roman.ttf'); font-weight: normal; font-style: normal; } @font-face{ - font-family: "brood"; + font-family: "main"; src:url('../fonts/CourierCode-Bold.ttf'); font-weight: bold; font-style: normal; } @font-face{ - font-family: "brood"; + font-family: "main"; src:url('../fonts/CourierCode-Italic.ttf'); font-weight: normal; font-style: italic; } @font-face{ - font-family: "brood"; + font-family: "main"; src:url('../fonts/CourierCode-BoldItalic.ttf'); font-weight: bold; font-style: italic; @@ -42,7 +36,7 @@ body{ left:0px; margin:0 auto 5em auto; padding: 0px 15px; - font-family: "brood", monospace; + font-family: "main", monospace; font-size: 14px; line-height:1.8; background-color: rgba(252, 255, 120, .7); @@ -87,7 +81,6 @@ h1, h2, h3, h4, h5, h6, #header{ } h2{ font-size: 100%; - font-family: "header"; font-weight: normal; text-decoration: underline; } @@ -135,7 +128,7 @@ ul li{ } /* category & translation link */ .post-info{ - font-size: 11px; + font-size: 12px; font-style: italic; } .post-info sup{ @@ -154,8 +147,8 @@ header { margin-top:0; margin-bottom:5em; padding-bottom:1em; - font-family: 'header'; - font-size: 12px; + font-family: 'main'; + font-size: 14px; line-height: 1.6; } header img{ @@ -164,27 +157,17 @@ header { margin: 0; vertical-align: calc(-2px); } + /* custom font size for index */ #content.index header{ - /*font-family: 'header';*/ - /*font-size: 22px;*/ - /*line-height: 1.8;*/ } header p{ display: inline; } #stream{ - /*display: none;*/ display: inline-block; } #stream .container{ - /*width: 50px; - height: 50px; - -webkit-border-radius: 50px; - -webkit-background-clip: padding-box; - -moz-border-radius: 50px; - -moz-background-clip: padding; - border-radius: 50px;*/ width: 200px; height: 200px; -webkit-border-radius: 200px; @@ -262,12 +245,13 @@ header { } /* title */ .hentry .article-info .entry-title{ + display: block; width: 100%; font-family: "header"; font-size: 165%; font-weight: bold; - line-height: 1.1; - letter-spacing: -0.08em; + line-height: 1.15; + letter-spacing: -0.01em; margin:0; } .hentry .article-info .entry-title a{ @@ -309,7 +293,7 @@ header { .entry-content, #page-content{ position: relative; max-width: 800px; - margin:-0.5em auto 0 20px; + margin:-3px auto 0 20px; } .entry-content img, #page-content img{ max-height:400px; @@ -364,11 +348,4 @@ header { .author{ display: none; -} - -/* add a monochrome filter over past events */ -/*.featured-image.past-event img{*/ - /*filter:opacity(0.25);*/ -/* filter: url("/images/filter.svg#monochrome"); - -webkit-filter: url("/images/filter.svg#monochrome");*/ -/*}*/ +} \ No newline at end of file diff --git a/themes/varia/templates/page.html b/themes/varia/templates/page.html index 2f5d3c0e1..02474ecdc 100644 --- a/themes/varia/templates/page.html +++ b/themes/varia/templates/page.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block title %}{{ page.title }}{%endblock%} + {% block content %}