From a08427b46223d6ebf8b8fffcd1d550e7e5c3cc40 Mon Sep 17 00:00:00 2001 From: Jeff MacKinnon Date: Mon, 24 Oct 2022 17:56:16 -0300 Subject: [PATCH] Minor changes for RSS pictures --- static/css-include/pelican.css | 142 +++++++++++++++++++++++++++++++-- static/css/main.css | 7 +- templates/article.html | 78 +++++++++++------- templates/base.html | 56 ++++++------- templates/page.html | 3 +- 5 files changed, 217 insertions(+), 69 deletions(-) diff --git a/static/css-include/pelican.css b/static/css-include/pelican.css index abd3c9b..30afe9c 100644 --- a/static/css-include/pelican.css +++ b/static/css-include/pelican.css @@ -7,6 +7,8 @@ /************************************************/ + + /************************************************/ /* resets */ @@ -144,13 +146,31 @@ box-shadow: 0 0 10px rgba(0,0,0,.5); /************************************************/ /* Article/Entry Info */ +#content { + max-width:750px; +} + #entry-info { - margin: 0 0 2em 0; - border-bottom: solid 5px var(--style-colour); - padding: 1em 0 0 0; + margin: 0 0 1em 0; + /*border-bottom: solid 5px var(--style-colour); + padding: 1em 0 0 0;*/ position: relative; } -VB + +#entry-info p { + line-height: 1; +} + +#post-info { + margin: 1em 0 1em 0; + border-bottom: solid 5px var(--style-colour); + padding: 1em 0 2em 0; + position: relative; +} +#post-info p { + line-height: 1; +} + .pentry { margin: 0 0 0 0; } @@ -193,4 +213,116 @@ VB #article-footer { margin-top: 5em; -} \ No newline at end of file +} + +/************************************************/ + +/* Comments */ + +.comments { + margin: .1em; + max-width: 650px; +} + + + + + +/* -- admonitions ----------------------------------------------------------- */ + +div.admonition { + width: 80%; + margin-top: 10px; + margin-bottom: 10px; + margin-right: 10px; + padding: 7px; + background-color: var(--admonition-backgroud); + +} + +div.admonition dt { + font-weight: bold; +} + +p.admonition-title { + background-color: var(--admonition-header-backgroud); + margin: 0px 10px 5px 0px; + font-weight: bold; + font-size: 1em; + +} + +div.body p.centered { + text-align: center; + margin-top: 25px; +} + + +div.admonition > :last-child { + margin-bottom: 0; +} + +div.admonition::after, +blockquote::after { + display: block; + content: ''; + clear: both; +} + +/************************************************/ + +/* Linktrees are a thing */ +/* used liberally from mollywhite.net from Sept 2, 2022 */ + +.linktree { + width: 100%; + height: 100%; +} +.linktree * { + box-sizing: border-box; +} +.linktree body { + width: 100%; + height: 100%; + background-color: #96B78A; +} +.linktree .linktree-content { + max-width: 680px; + margin: 100px auto 0 auto; + width: 100%; + height: 100%; + padding: 24px 12px; +} +.linktree .linktree-content .wrapper { + display: flex; + flex-direction: column; + justify-content: space-between; +} +.linktree .linktree-content .wrapper a.linktree-link { + display: block; + box-sizing: border-box; + width: 100%; + text-align: center; + text-decoration: none; + line-height: 40px; + background-color: #FFFFFF; + margin-bottom: 15px; + border: 2px solid #FFFFFF; + border-radius: 4px; + padding: 5px; +} +.linktree .linktree-content .wrapper a.linktree-link:hover { + background: rgba(255, 255, 255, 0.4); +} +.linktree .linktree-content .wrapper .social-links { + display: flex; + align-items: center; + justify-content: center; + width: 100%; +} +.linktree .linktree-content .wrapper .social-links a { + color: #FFFFFF; + text-decoration: none; + padding: 0 10px; + font-size: 120%; +} diff --git a/static/css/main.css b/static/css/main.css index ecb4e93..a8e453b 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -175,8 +175,8 @@ h1, h2, h3, h4, h5, h6 { h1 { font-size: 4em; - margin: 0 0 0.5em 0; - line-height: 1.3; } + margin: 0 0 0.2em 0; + line-height: 1.2; } h2 { font-size: 1.75em; } @@ -2117,7 +2117,8 @@ button, display: flex; border-bottom: solid 5px var(--style-colour); padding: 6em 0 1em 0; - position: relative; } + position: relative; + max-width:750px;} #header > * { -moz-flex: 1; -webkit-flex: 1; diff --git a/templates/article.html b/templates/article.html index ffdf745..72c5755 100644 --- a/templates/article.html +++ b/templates/article.html @@ -50,6 +50,12 @@ {% endif %} + {% if COMMENTS is sameas True %} + + {% endif %} + + + {% endblock %} {% block somemorehead %} @@ -64,19 +70,11 @@

{{ article.title }}

- {% if article.photo_image %} - - {% endif %} - -
{% import 'translations.html' as translations with context %} {{ translations.translations_for(article) }} -

Published:

- {% if article.modified %} -

Updated:

- {% endif %} + {% if article.authors %}

By {% for author in article.authors %} {{ author }} @@ -93,21 +91,23 @@ {% endif %}
+ {{ article.content }} - {% if article.photo_gallery %} -

- {% for title, gallery in article.photo_gallery %} -

{{ title }}

-
-
    - {% for name, photo, thumb, exif, caption in gallery %} -
    2. - {% endfor %} -
- {% endfor %} - - {% endif %} - {% if article.series %} + + {% if article.photo_gallery %} +

+ {% for title, gallery in article.photo_gallery %} +

{{ title }}

+
+
    + {% for name, photo, thumb, exif, caption in gallery %} +
    2. + {% endfor %} +
+ {% endfor %} + {% endif %} + + {% if article.series %}

This post is part {{ article.series.index }} of the "{{ article.series.name }}" series:

    @@ -119,7 +119,12 @@
{% endif %} -
+ +
+

Published:

+ {% if article.modified %} +

Updated:

+ {% endif %} {% if article.category %}
Category: {{ article.category }} @@ -134,6 +139,17 @@
{% endif %}
+ + + {% if COMMENTS is sameas True %} +
+

Comments?

+ + +
+
+ {% endif %} + {% if MASTODON_COMMENTS is sameas True %}

@@ -141,20 +157,26 @@

If its your first time commenting, click here to figure it out.

{% endif %} + {% if TWITTER_COMMENTS is sameas True %}

-

To join a conversation on Twitter Click Here, and to start a conversation Click Here

-

In future versions of this theme there will be a bot that will keep track of the comments and display them here, but that is for the future.

+

To join a conversation on Twitter click here.

{% endif %} - {% if ARTICLE_FOOTER == true %} +
+ {% if article.photo_image %} + + {% endif %} + {% if ARTICLE_FOOTER == true %} {% include 'include/article_footer.html' %} + {% endif %}
- {% endif %} +
+
{% endblock %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 79bdedf..de199fd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,8 +1,8 @@ -{% block head %} - {% block title %}{{ SITENAME }}{% endblock title %} + {% block head %} + {% if NASHOSTED %}NAS Hosted - {% endif %}{% block title %}{{ SITENAME }}{% endblock title %} {% if FAVICON %} {% endif %} @@ -15,53 +15,48 @@ {% endif %} {% if (article and article.photo_gallery) or (articles_page and articles_page.object_list[0].photo_gallery) %} -{% endif %} + {% endif %} -{% if FEED_ALL_ATOM %} + {% if FEED_ALL_ATOM %} -{% endif %} -{% if FEED_ALL_RSS %} + {% endif %} + {% if FEED_ALL_RSS %} -{% endif %} -{% if FEED_ATOM %} + {% endif %} + {% if FEED_ATOM %} -{% endif %} -{% if FEED_RSS %} + {% endif %} + {% if FEED_RSS %} -{% endif %} -{% if CATEGORY_FEED_ATOM and category %} + {% endif %} + {% if CATEGORY_FEED_ATOM and category %} -{% endif %} -{% if CATEGORY_FEED_RSS and category %} + {% endif %} + {% if CATEGORY_FEED_RSS and category %} -{% endif %} -{% if TAG_FEED_ATOM and tag %} + {% endif %} + {% if TAG_FEED_ATOM and tag %} -{% endif %} -{% if TAG_FEED_RSS and tag %} + {% endif %} + {% if TAG_FEED_RSS and tag %} -{% endif %} + {% endif %} -{% if TRACKING == True %} -{% include 'include/trackingcode.html' %} -{% endif %} - - -{% endblock head %} -{% block somemorehead %} -{% endblock somemorehead %} + {% if TRACKING == True %} + {% include 'include/trackingcode.html' %} + {% endif %} + {% endblock head %} + {% block somemorehead %} + {% endblock somemorehead %} -
-