mb/a-nourishing-network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
alicestrt 2020-12-01 16:09:01 +01:00
commit 090aa558e2
9 changed files with 94 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -77,7 +77,7 @@ md=$(wildcard content/Essays/*.md)
md2pdf=$(md:%.md=%.pdf) md2pdf=$(md:%.md=%.pdf)
%.pdf: %.md themes/basic/static/css/print.css %.pdf: %.md themes/basic/static/css/print.css
pandoc --pdf-engine=weasyprint -c themes/basic/static/css/print.css $< -o $@ pandoc -f markdown_mmd --pdf-engine=weasyprint -c themes/basic/static/css/print.css $< -o $@
print: $(md2pdf) print: $(md2pdf)
$(shell mv content/Essays/*.pdf content/print/) $(shell mv content/Essays/*.pdf content/print/)

2
content/Essays/Mel-Hogan_Pandemics-Dark-Cloud.md
View File

@ -1,4 +1,4 @@
Title: The Pandemic's Dark Cloud Title: 'The Pandemic's Dark Cloud'
Author: Mel Hogan Author: Mel Hogan
"The Pandemic\'s Dark Cloud" was written in November 2020 as a "The Pandemic\'s Dark Cloud" was written in November 2020 as a

3
content/cover.md → content/cover.txt
View File

@ -1,3 +1,6 @@
Title: Cover
Category: none
<pre> <pre>
a a a a a a a a a a a a a a

2
pelicanconf.py
View File

@ -32,7 +32,7 @@ AUTHOR_FEED_ATOM = None
PATH = 'content' PATH = 'content'
PAGE_PATHS = ['pages'] PAGE_PATHS = ['pages']
# STATIC_PATHS = [ 'images', 'favicon.ico', 'essays', 'projections' ] STATIC_PATHS = [ 'images', 'favicon.ico', 'ascii-art' ]
THEME = 'themes/basic' THEME = 'themes/basic'
THEME_STATIC_DIR = 'theme' THEME_STATIC_DIR = 'theme'

29
themes/basic/static/css/fonts.css Normal file
View File

@ -0,0 +1,29 @@
@font-face {
font-family: "White Rabbit";
src: url("../fonts/whiterabbit/whitrabt.ttf") format("truetype");
}
@font-face {
font-family: "IMB Plex Mono";
src: url("../fonts/imbplexmono/IBMPlexMono-Regular.ttf") format("truetype");
}
@font-face {
font-family: "IMB Plex Mono";
src: url("../fonts/imbplexmono/IBMPlexMono-Regular.ttf") format("truetype");
}
@font-face {
font-family: "Printed Circuitboard";
src: url("../fonts/printedcircuit/PrintedCircuitBoard.ttf") format("truetype");
}
@font-face {
font-family: "Not Courier Sans";
src: url("../fonts/notcouriersans/NotCourierSans.ttf") format("truetype");
}
@font-face {
font-family: "Unifont";
src: url("../fonts/unifont/unifont-13.0.03.ttf") format("truetype");
}

40
themes/basic/static/css/main.css
View File

@ -2,9 +2,12 @@ body {
position: relative; position: relative;
top: 0; top: 0;
left: 0; left: 0;
margin: 0; margin: 0 2em;
padding: 1em 4em; padding: 1em;
background-color: lavender;
font-family: monospace; font-family: monospace;
font-size: 14px;
color: red;
} }
header, header,
@ -14,12 +17,35 @@ footer{
position: relative; position: relative;
width: calc(100% - 4em); width: calc(100% - 4em);
margin: 2em 0; margin: 2em 0;
padding: 2em; /*padding: 2em;*/
border: 1px dotted magenta; /*text-align: center;*/
}
#menu .links a{
border: 1px solid red;
padding: 1em;
}
header pre,
footer pre{
/*text-align: center;*/
line-height: 1;
}
h1,
h2,
h3{
font-family: "White Rabbit";
}
a,
a:visited,
a:active{
color: magenta;
} }
article.post{ article.post{
margin: 2em 0; margin: 4em 0;
padding: 2em; /*padding: 2em;*/
background-color: rgb(240,240,240); /*background-color: white;*/
} }

7
themes/basic/templates/article.html
View File

@ -6,17 +6,18 @@
<h2 class="post-title">{{ article.title }}</h2> <h2 class="post-title">{{ article.title }}</h2>
<div class="post-info"> <div class="post-info">
<div class="author">
{{ article.author }}
</div>
<br>
<div class="date"> <div class="date">
{{ article.locale_date }} {{ article.locale_date }}
</div> </div>
{% if article.category %} {% if article.category %}
<div class="category"> <div class="category">
<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="post-content"> <div class="post-content">

17
themes/basic/templates/base.html
View File

@ -5,12 +5,18 @@
<title>{% block title %}{{ SITENAME }}{% endblock title %}</title> <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="generator" content="Pelican" /> <meta name="generator" content="Pelican" />
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/fonts.css" />
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" /> <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
{% endblock head %} {% endblock head %}
</head> </head>
<body> <body>
<header id="banner"> <header id="banner">
<p>HEADER</p> <pre>
) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) )
( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( (
) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) ) ) ) )) ) ) )
( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( ( ( ( (( ( ( (
</pre>
<h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1> <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
<nav id="menu"> <nav id="menu">
<div class="links"> <div class="links">
@ -43,7 +49,14 @@
</section> </section>
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">
<p>FOOTER</p> <pre>
o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o
o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o
o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o
</pre>
</footer> </footer>
</body> </body>

7
themes/basic/templates/index.html
View File

@ -4,6 +4,10 @@
<section> <section>
{% for article in articles %} {% for article in articles %}
<pre>
o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o
o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o
</pre>
<article class="post"> <article class="post">
<h2 class="post-title"> <h2 class="post-title">
<a href="{{ SITEURL }}/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a> <a href="{{ SITEURL }}/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
@ -26,6 +30,9 @@
<!-- {{ article.summary }} --> <!-- {{ article.summary }} -->
</div> </div>
</article> </article>
<pre>
) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ))
</pre>
{% endfor %} {% endfor %}
</section> </section>