From 72212032f81d50c04f9fadb9c5d3a81145b9a541 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Tue, 12 Sep 2017 14:56:24 +0200 Subject: [PATCH] new catcet theme added --- pelicanconf.py | 2 +- themes/catcet/static/css/main2.css | 221 ------------------ themes/catcet/templates/article.html | 50 ---- themes/catcet/templates/translations.html | 9 - themes/{catcet => cetcat}/static/css/main.css | 114 +++++---- .../{catcet => cetcat}/static/css/pygment.css | 0 .../static/fonts/Now-Black.otf | Bin .../static/fonts/Now-Bold.otf | Bin .../static/fonts/Now-Light.otf | Bin .../static/fonts/Now-Medium.otf | Bin .../static/fonts/Now-Regular.otf | Bin .../static/fonts/Now-Thin.otf | Bin themes/{catcet => cetcat}/static/js/stars.js | 0 .../templates/archives.html | 0 themes/cetcat/templates/article.html | 49 ++++ .../{catcet => cetcat}/templates/author.html | 0 .../{catcet => cetcat}/templates/authors.html | 0 themes/{catcet => cetcat}/templates/base.html | 2 +- .../templates/categories.html | 0 .../templates/category.html | 0 .../templates/gosquared.html | 0 .../{catcet => cetcat}/templates/index.html | 0 themes/{catcet => cetcat}/templates/page.html | 0 .../templates/pagination.html | 0 .../templates/period_archives.html | 0 .../templates/syndication.html | 0 themes/{catcet => cetcat}/templates/tag.html | 0 themes/{catcet => cetcat}/templates/tags.html | 0 themes/cetcat/templates/translations.html | 11 + 29 files changed, 135 insertions(+), 323 deletions(-) delete mode 100644 themes/catcet/static/css/main2.css delete mode 100644 themes/catcet/templates/article.html delete mode 100644 themes/catcet/templates/translations.html rename themes/{catcet => cetcat}/static/css/main.css (61%) rename themes/{catcet => cetcat}/static/css/pygment.css (100%) rename themes/{catcet => cetcat}/static/fonts/Now-Black.otf (100%) rename themes/{catcet => cetcat}/static/fonts/Now-Bold.otf (100%) rename themes/{catcet => cetcat}/static/fonts/Now-Light.otf (100%) rename themes/{catcet => cetcat}/static/fonts/Now-Medium.otf (100%) rename themes/{catcet => cetcat}/static/fonts/Now-Regular.otf (100%) rename themes/{catcet => cetcat}/static/fonts/Now-Thin.otf (100%) rename themes/{catcet => cetcat}/static/js/stars.js (100%) rename themes/{catcet => cetcat}/templates/archives.html (100%) create mode 100644 themes/cetcat/templates/article.html rename themes/{catcet => cetcat}/templates/author.html (100%) rename themes/{catcet => cetcat}/templates/authors.html (100%) rename themes/{catcet => cetcat}/templates/base.html (98%) rename themes/{catcet => cetcat}/templates/categories.html (100%) rename themes/{catcet => cetcat}/templates/category.html (100%) rename themes/{catcet => cetcat}/templates/gosquared.html (100%) rename themes/{catcet => cetcat}/templates/index.html (100%) rename themes/{catcet => cetcat}/templates/page.html (100%) rename themes/{catcet => cetcat}/templates/pagination.html (100%) rename themes/{catcet => cetcat}/templates/period_archives.html (100%) rename themes/{catcet => cetcat}/templates/syndication.html (100%) rename themes/{catcet => cetcat}/templates/tag.html (100%) rename themes/{catcet => cetcat}/templates/tags.html (100%) create mode 100644 themes/cetcat/templates/translations.html diff --git a/pelicanconf.py b/pelicanconf.py index dfbe89fc6..82fb79cf6 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -51,7 +51,7 @@ MENUITEMS=( ('news', '/'), ) -THEME = 'themes/catcet' +THEME = 'themes/cetcat' ARTICLE_LANG_URL = '{slug}-{lang}.html' diff --git a/themes/catcet/static/css/main2.css b/themes/catcet/static/css/main2.css deleted file mode 100644 index bc775d8b5..000000000 --- a/themes/catcet/static/css/main2.css +++ /dev/null @@ -1,221 +0,0 @@ -/* -2k17 Homebrewserver.club Pelican theme ---- -Style sheet is ordered vertically, with declarations for the header on top and footer on the bottom. - -With contributions by club members: -http://roelof.info -http://randomiser.info/ -http://majesticmoo.se -*/ - -@font-face { - font-family: 'NowBlack'; - src: url('../fonts/Now-Black.otf') format('opentype'); - font-weight: normal; - font-style: normal; - } - -@font-face { - font-family: 'NowBold'; - src: url('../fonts/Now-Bold.otf') format('opentype'); - font-weight: bold; - font-style: normal; - } - -@font-face { - font-family: 'NowLight'; - src: url('../fonts/Now-Light.otf') format('opentype'); - font-weight: normal; - font-style: normal; - } - -@font-face { - font-family: 'NowMedium'; - src: url('../fonts/Now-Medium.otf') format('opentype'); - font-weight: normal; - font-style: normal; - } - -@font-face { - font-family: 'NowRegular'; - src: url('../fonts/Now-Regular.otf') format('opentype'); - font-weight: normal; - font-style: normal; - } - -@font-face { - font-family: 'NowThin'; - src: url('../fonts/Now-Thin.otf') format('opentype'); - font-weight: normal; - font-style: normal; - } - -header { - width:100%; - margin-top:3em; - margin-bottom:3em; - color: #538cc6; -} - -#title { - margin-top:0.5em; - font-size: 120px; - width:50%; -} -#subtitle{ - font-size: 16px; -} - -hr { - color: white; - margin-top:1em; -} -pre { -} -#menu{ - font-size:23px; - font-weight:bold; - width:40%; - float: right; -} - -body { - line-height:1.5em; - background-color: #f2f2f2; - font-size: 16px; - margin: 0 auto; - width: 900px; - font-family:"NowRegular"; - font-style: normal; -} - -a { - color:#0000ff; - font-weight: bold; -} - -.paginator{ - float:right; - margin:0px; -} - -#index{ -} - -#post-list { - padding-left:0px; - margin-top:0px; -} - -ul { - padding-left:0px; -} - -.hentry{ - /*margin-top:2em;*/ - border-width: 1px; - border-color: #444; -} - -.article-info{ - clear: right; - display: inline; - float: left; - margin-bottom: 5em; - max-width: 150px; - padding-right: em; - transform: rotate(-3deg); -} - - - -.entry-title span{ - width:100%; - display:inline-block; -} - -.entry-content{ - display: inline; - float: right; - margin-bottom: 2.5em; - max-width: 700px; - padding-right: 1em; -} - -.entry-content pre{ - font-size:20px; - padding-left:1em; - overflow: auto; - background-color: #F8F8F8; - line-height:1.2em; -} - -.entry-content img{ - max-width:100%; - border: 2px solid white; -} - - -.entry-content ul { - font-size:20px; - line-height:1.5; - margin: auto; - max-width:800px; -} - -.highlight{ - margin: auto; - max-width:800px; -} - -#page-content img{ - max-width:100%; -} - -blockquote { - font-style:italic; -} - -#content{ - margin:auto; - width:100%; -} - -.divider { - font-size:12px; - width:100%; - line-height:1em; - background-color:white; -} - -.published{ - font-size:smaller; -} - -.article_tags{ - font-size:smaller; -} - - -#categories { - font-size: 40px; - margin-top: 2em; - text-align: center; -} -#pertaining{ - margin-top:2em; - text-align:center; - -} -.simple-footnotes{ - font-size:14px; - margin:auto; - max-width:800px; -} - -.author{ - font-size:smaller; -} - - diff --git a/themes/catcet/templates/article.html b/themes/catcet/templates/article.html deleted file mode 100644 index 784797689..000000000 --- a/themes/catcet/templates/article.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "base.html" %} -{% block head %} - {{ super() }} - {% if article.description %} - - {% endif %} - - {% if article.tags or article.category or article.keywords %} - - {% endif %} - - -{% endblock %} -
- ../ -
- ../ - - -{% block content %} -
-
-
- {{ article.title }}
- {% import 'translations.html' as translations with context %} - {{ translations.translations_for(article) }} -
- - {% if article.modified %} - - {% endif %} - {% if article.authors %} -
- By {% for author in article.authors %} - {{ author }} - {% endfor %} -
- {% endif %} -
-
-
- {{ article.content }} -
-
-{% endblock %} diff --git a/themes/catcet/templates/translations.html b/themes/catcet/templates/translations.html deleted file mode 100644 index db8c372df..000000000 --- a/themes/catcet/templates/translations.html +++ /dev/null @@ -1,9 +0,0 @@ -{% macro translations_for(article) %} -{% if article.translations %} -Translations: -{% for translation in article.translations %} -{{ translation.lang }} -{% endfor %} -{% endif %} -{% endmacro %} - diff --git a/themes/catcet/static/css/main.css b/themes/cetcat/static/css/main.css similarity index 61% rename from themes/catcet/static/css/main.css rename to themes/cetcat/static/css/main.css index 4b5ddc729..207369e7d 100644 --- a/themes/catcet/static/css/main.css +++ b/themes/cetcat/static/css/main.css @@ -54,7 +54,11 @@ http://majesticmoo.se header { width:100%; margin-top:3em; - margin-bottom:3em; + margin-bottom:1em; + line-height: 1.5em; + border-bottom: 1px solid; + padding-bottom:1em; + /*transform:rotate(3deg);*/ } #title { @@ -67,33 +71,44 @@ header { } hr { - color: white; + border:0; + color: black; + border-bottom:1px solid; margin-top:1em; } pre { } #menu{ - font-size:40px; + position: absolute; + top:25px; + right:25px; + font-size:20px; font-weight:bold; - width:50%; float: right; } body { - line-height:1.5em; - background-color: #f13030; - font-size: 16px; + font-size: 16px; + line-height:1.8; + background-color: rgb(239, 225, 79); + /*background-color: rgba(100,100,250,1);*/ margin: 0 auto; - width: 900px; - color:white; - font-family:"NowRegular"; + width: calc(100% - 50px); + color:black; + /*color:white;*/ + font-family: monospace; font-style: normal; } a { - color:#22181c; + color:#7e5211; font-weight: bold; } +h1, h2, h3, h4, h5, h6, #header{ + font-family: sans-serif, "NowRegular"; + margin:1em 0 0 0; + padding:0; +} .paginator{ float:right; @@ -112,35 +127,47 @@ ul { padding-left:0px; } -.hentry{ - /*margin-top:2em;*/ - border-width: 1px; - border-color: #444; +#translation{ + float: left; } -.article-info{ - clear: right; - display: inline; +.hentry{ float: left; - margin-bottom: 5em; - max-width: 150px; - padding-right: em; - transform: rotate(-3deg); + width: 200px; + display: inline-block; + margin-right:2em; + font-size: 12px; } +.article-info{ + /*clear: right;*/ + /*display: inline;*/ + /*float: left;*/ + /*margin-bottom: 0em;*/ + /*max-width: 150px;*/ + /*padding-right: 1em;*/ + /*transform: rotate(-3deg);*/ +} +/* log */ .entry-title span{ - width:100%; - display:inline-block; + width:100%; + display:inline-block; } - .entry-content{ - display: inline; - float: right; - margin-bottom: 2.5em; - max-width: 700px; - padding-right: 1em; + /*display: inline;*/ + /*float: right;*/ + /*margin-top:-6em;*/ + /*margin-bottom: 2.5em;*/ + /*min-width: 400px;*/ + /*max-width: 800px;*/ + /*transform:rotate(-3deg);*/ + /*padding:0 15%;*/ + /*border-bottom: 1px solid;*/ +} +.entry-content p, .entry-content h1, .entry-content h2, .entry-content h3{ + /*transform:rotate(3deg); */ } .entry-content pre{ @@ -150,25 +177,30 @@ ul { background-color: #F8F8F8; line-height:1.2em; } - .entry-content img{ max-width:100%; - border: 2px solid white; } - - .entry-content ul { font-size:20px; line-height:1.5; margin: auto; max-width:800px; } +.separator hr{ + display: none; +} .highlight{ margin: auto; max-width:800px; } +#page-content{ + clear: both; + float: left; + margin-top:-0.5em; + /*max-width: 800px;*/ +} #page-content img{ max-width:100%; } @@ -178,8 +210,8 @@ blockquote { } #content{ - margin:auto; - width:100%; + margin:auto; + width:100%; } .divider { @@ -188,15 +220,14 @@ blockquote { line-height:1em; background-color:white; } - +/* .published{ - font-size:smaller; + font-size:smaller; } - .article_tags{ - font-size:smaller; + font-size:smaller; } - +*/ #categories { font-size: 40px; @@ -215,6 +246,7 @@ blockquote { } .author{ + display: none; font-size:smaller; } diff --git a/themes/catcet/static/css/pygment.css b/themes/cetcat/static/css/pygment.css similarity index 100% rename from themes/catcet/static/css/pygment.css rename to themes/cetcat/static/css/pygment.css diff --git a/themes/catcet/static/fonts/Now-Black.otf b/themes/cetcat/static/fonts/Now-Black.otf similarity index 100% rename from themes/catcet/static/fonts/Now-Black.otf rename to themes/cetcat/static/fonts/Now-Black.otf diff --git a/themes/catcet/static/fonts/Now-Bold.otf b/themes/cetcat/static/fonts/Now-Bold.otf similarity index 100% rename from themes/catcet/static/fonts/Now-Bold.otf rename to themes/cetcat/static/fonts/Now-Bold.otf diff --git a/themes/catcet/static/fonts/Now-Light.otf b/themes/cetcat/static/fonts/Now-Light.otf similarity index 100% rename from themes/catcet/static/fonts/Now-Light.otf rename to themes/cetcat/static/fonts/Now-Light.otf diff --git a/themes/catcet/static/fonts/Now-Medium.otf b/themes/cetcat/static/fonts/Now-Medium.otf similarity index 100% rename from themes/catcet/static/fonts/Now-Medium.otf rename to themes/cetcat/static/fonts/Now-Medium.otf diff --git a/themes/catcet/static/fonts/Now-Regular.otf b/themes/cetcat/static/fonts/Now-Regular.otf similarity index 100% rename from themes/catcet/static/fonts/Now-Regular.otf rename to themes/cetcat/static/fonts/Now-Regular.otf diff --git a/themes/catcet/static/fonts/Now-Thin.otf b/themes/cetcat/static/fonts/Now-Thin.otf similarity index 100% rename from themes/catcet/static/fonts/Now-Thin.otf rename to themes/cetcat/static/fonts/Now-Thin.otf diff --git a/themes/catcet/static/js/stars.js b/themes/cetcat/static/js/stars.js similarity index 100% rename from themes/catcet/static/js/stars.js rename to themes/cetcat/static/js/stars.js diff --git a/themes/catcet/templates/archives.html b/themes/cetcat/templates/archives.html similarity index 100% rename from themes/catcet/templates/archives.html rename to themes/cetcat/templates/archives.html diff --git a/themes/cetcat/templates/article.html b/themes/cetcat/templates/article.html new file mode 100644 index 000000000..b84d456c7 --- /dev/null +++ b/themes/cetcat/templates/article.html @@ -0,0 +1,49 @@ +{% extends "base.html" %} + +{% block head %} + {{ super() }} + {% if article.description %} + + {% endif %} + + {% if article.tags or article.category or article.keywords %} + + {% endif %} +{% endblock %} + +
+ ../ +
+ ../ + + {% block content %} +
+
+
+ {{ article.title }} +
+ {% import 'translations.html' as translations with context %} + {{ translations.translations_for(article) }} +
+ + {% if article.modified %} + + {% endif %} + {% if article.authors %} +
+ By {% for author in article.authors %} + {{ author }} + {% endfor %} +
+ {% endif %} +
+
+
+ {{ article.content }} +
+
+{% endblock %} diff --git a/themes/catcet/templates/author.html b/themes/cetcat/templates/author.html similarity index 100% rename from themes/catcet/templates/author.html rename to themes/cetcat/templates/author.html diff --git a/themes/catcet/templates/authors.html b/themes/cetcat/templates/authors.html similarity index 100% rename from themes/catcet/templates/authors.html rename to themes/cetcat/templates/authors.html diff --git a/themes/catcet/templates/base.html b/themes/cetcat/templates/base.html similarity index 98% rename from themes/catcet/templates/base.html rename to themes/cetcat/templates/base.html index f6b923d77..ac036f657 100644 --- a/themes/catcet/templates/base.html +++ b/themes/cetcat/templates/base.html @@ -61,7 +61,7 @@ {% endfor %} {% endif %} {% endif %} -
+ {% block content %} {% endblock %} diff --git a/themes/catcet/templates/categories.html b/themes/cetcat/templates/categories.html similarity index 100% rename from themes/catcet/templates/categories.html rename to themes/cetcat/templates/categories.html diff --git a/themes/catcet/templates/category.html b/themes/cetcat/templates/category.html similarity index 100% rename from themes/catcet/templates/category.html rename to themes/cetcat/templates/category.html diff --git a/themes/catcet/templates/gosquared.html b/themes/cetcat/templates/gosquared.html similarity index 100% rename from themes/catcet/templates/gosquared.html rename to themes/cetcat/templates/gosquared.html diff --git a/themes/catcet/templates/index.html b/themes/cetcat/templates/index.html similarity index 100% rename from themes/catcet/templates/index.html rename to themes/cetcat/templates/index.html diff --git a/themes/catcet/templates/page.html b/themes/cetcat/templates/page.html similarity index 100% rename from themes/catcet/templates/page.html rename to themes/cetcat/templates/page.html diff --git a/themes/catcet/templates/pagination.html b/themes/cetcat/templates/pagination.html similarity index 100% rename from themes/catcet/templates/pagination.html rename to themes/cetcat/templates/pagination.html diff --git a/themes/catcet/templates/period_archives.html b/themes/cetcat/templates/period_archives.html similarity index 100% rename from themes/catcet/templates/period_archives.html rename to themes/cetcat/templates/period_archives.html diff --git a/themes/catcet/templates/syndication.html b/themes/cetcat/templates/syndication.html similarity index 100% rename from themes/catcet/templates/syndication.html rename to themes/cetcat/templates/syndication.html diff --git a/themes/catcet/templates/tag.html b/themes/cetcat/templates/tag.html similarity index 100% rename from themes/catcet/templates/tag.html rename to themes/cetcat/templates/tag.html diff --git a/themes/catcet/templates/tags.html b/themes/cetcat/templates/tags.html similarity index 100% rename from themes/catcet/templates/tags.html rename to themes/cetcat/templates/tags.html diff --git a/themes/cetcat/templates/translations.html b/themes/cetcat/templates/translations.html new file mode 100644 index 000000000..1ea01319b --- /dev/null +++ b/themes/cetcat/templates/translations.html @@ -0,0 +1,11 @@ +{% macro translations_for(article) %} +{% if article.translations %} +
+ Translations: + {% for translation in article.translations %} + {{ translation.lang }} + {% endfor %} +
+{% endif %} +{% endmacro %} +