Rename theme options to match pelican options

Format stylesheet
main
Raymond Wanyoike 2016-11-07 13:10:33 +03:00
parent e960b3e1e0
commit 218b91fbe1
4 changed files with 34 additions and 37 deletions

View File

@ -37,16 +37,6 @@ a:hover {
border-bottom: 1px solid #ddd;
}
.main {
background-color: #fff;
padding: 20px 0;
}
.footer {
border-top: 1px solid #ddd;
padding: 20px 0;
}
.header img {
border: 4px solid #333;
margin: 20px 0;
@ -70,6 +60,16 @@ a:hover {
margin-bottom: 10px;
}
.main {
background-color: #fff;
padding: 20px 0;
}
.footer {
border-top: 1px solid #ddd;
padding: 20px 0;
}
.page-header {
margin-top: 0;
}

View File

@ -20,7 +20,7 @@
<li class="text-muted" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</li>
<li>&middot;</li>
<li><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></li>
{% if article.authors and SHOW_ARTICLE_AUTHORS %}
{% if article.authors and ARTICLE_AUTHORS %}
<li>&middot;</li>
<li>By
{% for author in article.authors %}

View File

@ -34,7 +34,7 @@
<link rel="alternate" type="application/rss+xml" href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" title="Tags RSS Feed">
{% endif %}
{% if SHOW_FAVICONS %}
{% if FAVICONS %}
<link rel="apple-touch-icon" href="{{ SITEURL }}/apple-touch-icon.png" sizes="180x180">
<link rel="icon" type="image/png" href="{{ SITEURL }}/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="{{ SITEURL }}/favicon-16x16.png" sizes="16x16">
@ -59,50 +59,47 @@
<header class="header">
<div class="container">
<div class="row">
{% if SITE_IMAGE %}
{% if SITEIMAGE %}
<div class="col-sm-4 hidden-xs">
<a href="{{ SITEURL }}"><img class="img-responsive" src={{ SITE_IMAGE }}></a>
<a href="{{ SITEURL }}"><img class="img-responsive" src={{ SITEIMAGE }}></a>
</div>
{% endif %}
<div class="col-sm-{% if SITE_IMAGE %}8{% else %}12{% endif %}">
<div class="col-sm-{% if SITEIMAGE %}8{% else %}12{% endif %}">
<h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
<p>{{ SITE_TAGLINE }}</p>
{% if EXTERNAL_LINKS or PAGES or EMAIL_LINK or FACEBOOK_LINK or FEED_ALL_ATOM or GITHUB_LINK or GOOGLE_LINK or TWITTER_LINK %}
<p>{{ SITESUBTITLE }}</p>
{% if LINKS or PAGES or FACEBOOK_URL or FEED_ALL_ATOM or GITHUB_URL or G_PLUS_URL or TWITTER_URL %}
<hr>
<nav class="list-inline">
{% if EXTERNAL_LINKS %}
{% for title, link in EXTERNAL_LINKS %}
{% if LINKS %}
{% for title, link in LINKS %}
<li><a href="{{ link }}" target="_blank">{{ title }}</a></li>
{% endfor %}
{% endif %}
{% for p in PAGES %}
{% if EXTERNAL_LINKS and loop.first %}
{% if LINKS and loop.first %}
<li class="text-muted">|</li>
{% endif %}
<li><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}
{% if EMAIL_LINK or FACEBOOK_LINK or FEED_ALL_ATOM or GITHUB_LINK or GOOGLE_LINK or TWITTER_LINK %}
{% if EXTERNAL_LINKS or PAGES %}
{% if FACEBOOK_URL or FEED_ALL_ATOM or GITHUB_URL or G_PLUS_URL or TWITTER_URL %}
{% if LINKS or PAGES %}
<li class="text-muted">|</li>
{% endif %}
{% endif %}
{% if EMAIL_LINK %}
<li><a class="fa fa-fw fa-envelope" href="mailto:{{ EMAIL_LINK }}"></a></li>
{% endif %}
{% if FACEBOOK_LINK %}
<li><a class="fa fa-fw fa-facebook" href="{{ FACEBOOK_LINK }}" target="_blank"></a></li>
{% if FACEBOOK_URL %}
<li><a class="fa fa-fw fa-facebook" href="{{ FACEBOOK_URL }}" target="_blank"></a></li>
{% endif %}
{% if FEED_ALL_ATOM %}
<li><a class="fa fa-fw fa-feed" href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" target="_blank"></a></li>
{% endif %}
{% if GITHUB_LINK %}
<li><a class="fa fa-fw fa-github" href="{{ GITHUB_LINK }}" target="_blank"></a></li>
{% if GITHUB_URL %}
<li><a class="fa fa-fw fa-github" href="{{ GITHUB_URL }}" target="_blank"></a></li>
{% endif %}
{% if GOOGLE_LINK %}
<li><a class="fa fa-fw fa-google-plus" href="{{ GOOGLE_LINK }}" target="_blank"></a></li>
{% if G_PLUS_URL %}
<li><a class="fa fa-fw fa-google-plus" href="{{ G_PLUS_URL }}" target="_blank"></a></li>
{% endif %}
{% if TWITTER_LINK %}
<li><a class="fa fa-fw fa-twitter" href="{{ TWITTER_LINK }}" target="_blank"></a></li>
{% if TWITTER_URL %}
<li><a class="fa fa-fw fa-twitter" href="{{ TWITTER_URL }}" target="_blank"></a></li>
{% endif %}
</nav>
{% endif %}
@ -125,7 +122,7 @@
<div class="row">
<div class="col-sm-6">
<nav class="list-inline">
{% if SHOW_ARTICLE_AUTHORS %}
{% if ARTICLE_AUTHORS %}
<li><a href="{{ SITEURL }}/authors.html">Authors</a></li>
{% endif %}
<li><a href="{{ SITEURL }}/archives.html">Archives</a></li>

View File

@ -2,11 +2,11 @@
{% block head %}
{{ super() }}
<meta name="description" content="{{ SITE_DESCRIPTION|striptags }}">
<meta name="description" content="{{ META_DESCRIPTION|striptags }}">
{% endblock %}
{% block title %}
{{ SITENAME }} &mdash; {{ SITE_TAGLINE }}
{{ SITENAME }} &mdash; {{ SITESUBTITLE }}
{% endblock %}
{% block page_header %}
@ -19,7 +19,7 @@ All Articles
<header class="col-sm-4 hidden-xs">
<div class="text-muted" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</div>
<div><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></div>
{% if article.authors and SHOW_ARTICLE_AUTHORS %}
{% if article.authors and ARTICLE_AUTHORS %}
<div>By
{% for author in article.authors %}
<a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}