Updates
This commit is contained in:
parent
3aaf57b04c
commit
26381ccbfb
16
static/css/main.css
Executable file → Normal file
16
static/css/main.css
Executable file → Normal file
|
@ -1,6 +1,5 @@
|
|||
@import url("pygment.css");
|
||||
|
||||
body { margin:0px; padding:20px 0px; text-align:center; font-family:"Palatino Linotype", "Book Antiqua", Palatino, serif; color:#000000; }
|
||||
body { margin:0px; padding:20px 0px; text-align:center; font-family:"Times New Roman", Times, serif; color:#000000; }
|
||||
a, a:visited { text-decoration:none; color:#1d2a78; }
|
||||
a:hover { text-decoration:underline; }
|
||||
h1, h2, h3, h4, h5, h6, h7 { margin:0px; line-height: 1.1em; }
|
||||
|
@ -11,10 +10,10 @@ blockquote cite { display:block; padding:10px 20px 0 0; text-align:right; }
|
|||
input, textarea { padding:5px; border:1px solid #8A8A8A; background:#EAEAEA; }
|
||||
input:hover, textarea:hover, blockquote:hover { background:#E5E5E5; }
|
||||
|
||||
#wrap { margin:0px auto; text-align:left; font-size: 14px; line-height: 1.4; }
|
||||
#wrap { margin:0px auto; text-align:left; line-height: 1.4; }
|
||||
#container { float:right; }
|
||||
#sidebar { overflow:hidden; clear:left; text-align:right; width:200px; height:auto; padding:0px 15px 0px 0px; border-right:1px dotted #C8C8C8; }
|
||||
#sidebar li { list-style-type:none; font-size: 1.2em; font-weight: bold; }
|
||||
#sidebar li { list-style-type:none; font-size: 1.2em; line-height: 1.3em; font-weight: bold; }
|
||||
#sidebar > li { margin:20px 0px; }
|
||||
#sidebar h1 { border-bottom:1px dotted #C8C8C8; }
|
||||
#sidebar .description { display:block; font-size: 1.1em; width:100%; height:auto; margin:0px 0px 10px 0px; }
|
||||
|
@ -41,7 +40,14 @@ ul.sub-menu, ul.children { margin:0px 10px 0px 0px; }
|
|||
.portfolio h4 { font-size: 2.0em; font-family: sans; }
|
||||
.portfolio img { display:block; border:1px solid #000000 !important; margin-left: auto; margin-right: auto; max-height: 100%; max-width: 100%; }
|
||||
|
||||
.entry { font-size: 1.15em; line-height: 1.3em; padding-right: 1.0em; max-width:1024px; }
|
||||
.prow { display: flex; flex-wrap: wrap; padding: 0 4px; }
|
||||
.pcolumn { flex: 25%; max-width: 25%; padding: 0 4px; }
|
||||
.pcolumn img { margin-top: 8px; vertical-align: middle; }
|
||||
@media screen and (max-width: 800px) { .pcolumn { flex: 50%; max-width: 50%; } }
|
||||
@media screen and (max-width: 600px) { .pcolumn { flex: 100%; max-width: 100%; } }
|
||||
|
||||
|
||||
.entry { font-size: 1.15em; padding-right: 1.0em; max-width:1024px; }
|
||||
.entry h2, h3, h4, h5 { margin:30px 0px 10px 0px; }
|
||||
|
||||
.entry img { display:block; border:1px solid #000000 !important; margin-left: auto; margin-right: auto; max-height: 100%; max-width: 100%; }
|
||||
|
|
2
static/css/pygment.css
Executable file → Normal file
2
static/css/pygment.css
Executable file → Normal file
|
@ -2,8 +2,8 @@
|
|||
.highlight pre {
|
||||
color: #FFFFFF;
|
||||
background-color: #333333;
|
||||
padding: 10px;
|
||||
white-space: pre-wrap;
|
||||
padding: 0.20em;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
|
|
0
static/css/pygment.css.min
Executable file → Normal file
0
static/css/pygment.css.min
Executable file → Normal file
0
templates/analytics.html
Executable file → Normal file
0
templates/analytics.html
Executable file → Normal file
0
templates/archives.html
Executable file → Normal file
0
templates/archives.html
Executable file → Normal file
6
templates/article.html
Executable file → Normal file
6
templates/article.html
Executable file → Normal file
|
@ -1,6 +1,9 @@
|
|||
{% extends "base.html" %}
|
||||
{% block title %}{{ super() }} : {{ article.title }}{% endblock %}
|
||||
{% block content %}
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="entry">
|
||||
<header>
|
||||
<h1><a href="{{ SITEURL }}" id="site-title"> {#{{ SITENAME }}#} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a> {#:#}
|
||||
<a href="{{ SITEURL }}/{{ article.url }}" id="page-title">{{ article.title }}</a></h1>
|
||||
|
@ -23,7 +26,8 @@
|
|||
document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the comments.</noscript>
|
||||
{% endif %}
|
||||
</article>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
0
templates/author.html
Executable file → Normal file
0
templates/author.html
Executable file → Normal file
0
templates/authors.html
Executable file → Normal file
0
templates/authors.html
Executable file → Normal file
13
templates/base.html
Executable file → Normal file
13
templates/base.html
Executable file → Normal file
|
@ -22,14 +22,8 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="entry">
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
|
||||
<div id="sidebar" style="width:25%">
|
||||
<h1><a href="{{ SITEURL }} " title="title">{{ SITENAME }}</a></h1>
|
||||
|
@ -38,8 +32,9 @@
|
|||
<ul>
|
||||
<li><a href="{{ SITEURL }}/index.html">Home</a></li>
|
||||
<li><a href="{{ SITEURL }}/posts.html">Articles</a></li>
|
||||
<li><a href="{{ SITEURL }}/portfolio.html">Photography</a></li>
|
||||
<li><a href="https://portfolio.leanderhutton.com/">Photography</a></li>
|
||||
<li><a href="{{ SITEURL }}/about.html">About</a></li>
|
||||
<li><a href="{{ SITEURL }}/recommendations.html">What I Use</a></li>
|
||||
{% if categories|length > 1 %}
|
||||
<!-- <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
|
||||
{% endif %}
|
||||
|
|
5
templates/categories.html
Executable file → Normal file
5
templates/categories.html
Executable file → Normal file
|
@ -1,8 +1,13 @@
|
|||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="entry">
|
||||
<ul>
|
||||
{% for category, articles in categories %}
|
||||
<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
0
templates/category.html
Executable file → Normal file
0
templates/category.html
Executable file → Normal file
0
templates/comments.html
Executable file → Normal file
0
templates/comments.html
Executable file → Normal file
0
templates/disqus_script.html
Executable file → Normal file
0
templates/disqus_script.html
Executable file → Normal file
0
templates/github.html
Executable file → Normal file
0
templates/github.html
Executable file → Normal file
6
templates/index.html
Executable file → Normal file
6
templates/index.html
Executable file → Normal file
|
@ -1,6 +1,9 @@
|
|||
{% extends "base.html" %}
|
||||
{% block content_title %}{% endblock %}
|
||||
{% block content %}
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="entry">
|
||||
{% if articles %}
|
||||
|
||||
<header>
|
||||
|
@ -38,5 +41,6 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
|
|
80
templates/landing.html
Executable file → Normal file
80
templates/landing.html
Executable file → Normal file
|
@ -1,83 +1,9 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>{% block title %}{{ SITENAME }}{%endblock%}</title>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
|
||||
<link href="{{ SITEURL }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
|
||||
{% if FEED_RSS %}
|
||||
<link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
|
||||
{% endif %}
|
||||
|
||||
<!--[if IE]>
|
||||
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
|
||||
|
||||
<!--[if lte IE 7]>
|
||||
<link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
|
||||
<script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
|
||||
|
||||
<!--[if lt IE 7]>
|
||||
<link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div id="landing" class="entry">
|
||||
{{ page.content }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="sidebar" style="width:25%">
|
||||
<h1><a href="{{ SITEURL }} " title="title">{{ SITENAME }}</a></h1>
|
||||
<span class="description">{{ DESCRIPTION }} </span>
|
||||
<nav>
|
||||
<ul>
|
||||
<li><a href="index.html">Home</a></li>
|
||||
<li><a href="posts.html">Articles</a></li>
|
||||
<li><a href="portfolio.html">Photography</a></li>
|
||||
<li><a href="about.html">About</a></li>
|
||||
{% if categories|length > 1 %}
|
||||
<!-- <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
|
||||
{% endif %}
|
||||
{% if tags|length > 1 %}
|
||||
<li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
|
||||
{% endif %} -->
|
||||
<br />
|
||||
<!--
|
||||
<li>Galleries:</li>
|
||||
{% for page in pages %}
|
||||
{% if page.title != "About" and page.title !="Welcome" %}
|
||||
<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>{% if not loop.last %}{% endif %}</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<br />
|
||||
--> <li>{{ LINKS_WIDGET_NAME | default('links') }}</li>
|
||||
{% for name, link in LINKS %}
|
||||
<li><a href="{{ link }}">{{ name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<span class="feed"><a href="{{ SITEURL }}/{{ FEED_RSS }}">RSS</a> | <a href="{{ SITEURL }}/{{ FEED_ATOM }}">Atom</a></span>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
|
||||
<div id="credits">
|
||||
<span>Powered by <a href="https://www.debian.org/" target="_blank">Debian GNU/Linux</a> and <a href="https://blog.getpelican.com/" target="_blank">Pelican</a>.</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% include 'analytics.html' %}
|
||||
{% include 'piwik.html' %}
|
||||
{% include 'disqus_script.html' %}
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
{% endblock %}
|
||||
|
|
6
templates/page.html
Executable file → Normal file
6
templates/page.html
Executable file → Normal file
|
@ -1,6 +1,10 @@
|
|||
{% extends "base.html" %}
|
||||
{% block title %}{{ page.title }}{% endblock %}
|
||||
{% block content %}
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="entry">
|
||||
|
||||
<header>
|
||||
<h1><a href="{{ SITEURL }}" id="site-title">{# {{ SITENAME }} #} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a> {#:#}
|
||||
<a href="{{ SITEURL }}/{{ page.url }}" id="page-title">{{ page.title }}</a></h1>
|
||||
|
@ -8,4 +12,6 @@
|
|||
<article>
|
||||
{{ page.content }}
|
||||
</article>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
0
templates/pagination.html
Executable file → Normal file
0
templates/pagination.html
Executable file → Normal file
5
templates/piwik.html
Executable file → Normal file
5
templates/piwik.html
Executable file → Normal file
|
@ -12,8 +12,9 @@
|
|||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
try {
|
||||
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {{ PIWIK_SITE_ID }});
|
||||
piwikTracker.trackPageView();
|
||||
piwikTracker.enableLinkTracking();
|
||||
piwikTracker.disableCookies();
|
||||
piwikTracker.trackPageView();
|
||||
// piwikTracker.enableLinkTracking();
|
||||
} catch( err ) {}
|
||||
// @license-end
|
||||
</script><noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
|
||||
|
|
95
templates/portfolio.html
Executable file → Normal file
95
templates/portfolio.html
Executable file → Normal file
|
@ -1,84 +1,13 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>{% block title %}{{ SITENAME }}{%endblock%}</title>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
|
||||
<link href="{{ SITEURL }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
|
||||
{% if FEED_RSS %}
|
||||
<link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
|
||||
{% endif %}
|
||||
{% extends "base.html" %}
|
||||
{% block title %}{{ page.title }}{% endblock %}
|
||||
{% block content %}
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="entry">
|
||||
|
||||
<!--[if IE]>
|
||||
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
|
||||
|
||||
<!--[if lte IE 7]>
|
||||
<link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
|
||||
<script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
|
||||
|
||||
<!--[if lt IE 7]>
|
||||
<link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="portfolio">
|
||||
{{ page.content }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="sidebar" style="width:25%">
|
||||
<h1><a href="{{ SITEURL }} " title="title">{{ SITENAME }}</a></h1>
|
||||
<span class="description">{{ DESCRIPTION }} </span>
|
||||
<nav>
|
||||
<ul>
|
||||
<li><a href="index.html">Home</a></li>
|
||||
<li><a href="posts.html">Articles</a></li>
|
||||
<li><a href="portfolio.html">Photography</a></li>
|
||||
<li><a href="about.html">About</a></li>
|
||||
{% if categories|length > 1 %}
|
||||
<!-- <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
|
||||
{% endif %}
|
||||
{% if tags|length > 1 %}
|
||||
<li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
|
||||
{% endif %} -->
|
||||
<br />
|
||||
<!--
|
||||
<li>Photo Portfolio:</li>
|
||||
{% for page in pages %}
|
||||
{% if page.title != "About" and page.title !="Welcome" and page.title !="Portfolio" %}
|
||||
<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>{% if not loop.last %}{% endif %}</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<br />
|
||||
-->
|
||||
<li>{{ LINKS_WIDGET_NAME | default('links') }}</li>
|
||||
{% for name, link in LINKS %}
|
||||
<li><a href="{{ link }}">{{ name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<span class="feed"><a href="{{ SITEURL }}/{{ FEED_RSS }}">RSS</a> | <a href="{{ SITEURL }}/{{ FEED_ATOM }}">Atom</a></span>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
|
||||
<div id="credits">
|
||||
<span>Powered by <a href="https://www.debian.org/" target="_blank">Debian GNU/Linux</a> and <a href="https://blog.getpelican.com/" target="_blank">Pelican</a>.</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% include 'analytics.html' %}
|
||||
{% include 'piwik.html' %}
|
||||
{% include 'disqus_script.html' %}
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<article>
|
||||
{{ page.content }}
|
||||
</article>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
0
templates/tag.html
Executable file → Normal file
0
templates/tag.html
Executable file → Normal file
0
templates/taglist.html
Executable file → Normal file
0
templates/taglist.html
Executable file → Normal file
6
templates/tags.html
Executable file → Normal file
6
templates/tags.html
Executable file → Normal file
|
@ -1,9 +1,13 @@
|
|||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
<div id="wrap" style="width:100%">
|
||||
<div id="container" style="width:70%">
|
||||
<div class="entry">
|
||||
<ul>
|
||||
{% for tag, articles in tags %}
|
||||
<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
|
0
templates/translations.html
Executable file → Normal file
0
templates/translations.html
Executable file → Normal file
0
templates/twitter.html
Executable file → Normal file
0
templates/twitter.html
Executable file → Normal file
Loading…
Reference in New Issue
Block a user