diff --git a/content/design-work.md b/content/design-work.md index 1964c11f687584ba2c80d3b5394d06a5eb4cc257..32caf4f675cabeebfa2389200fd4998d0deaa816 100644 --- a/content/design-work.md +++ b/content/design-work.md @@ -4,6 +4,7 @@ Author: Sporiff Category: Announcement Slug: design-work Summary: We've had a good hard look in the mirror and decided to change our look. +Donation: True As we mentioned in our [previous post]({filename}2022-january-update.md), we've been thinking about our image a lot lately. At the moment, it's difficult for us to put new designs in place. It's even harder for us to keep everything consistent. This has led to lots of differences between our website, blog, and apps. diff --git a/pelicanconf.py b/pelicanconf.py index efbef91e305733b210feb29b371588178f4ecd58..0a6d34d22240a84c14af9d946c174274941b5416 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -52,8 +52,8 @@ MARKDOWN = { } DONATION_MESSAGES = [ - 'Like what we\'re doing? Consider donating to help us out 🙏', - 'Help us keep the lights on around here by donating to the project 💡', - 'Funkwhale is free software, but developing it still requires money. Consider donating to help us keep going 💪', - '❤️ Funkwhale? Why not help us out by donating what you can?' + 'Consider donating to help us out 🙏', + 'Help us keep the lights on around here 💡', + 'Consider donating to help us keep going 💪', + '❤️ Funkwhale? Why not donate?' ] diff --git a/theme/funkwhale/static/css/style.css b/theme/funkwhale/static/css/style.css index 66fb64e91308ab5a5bf78b146f5d1d3858445dc1..dac67c8ae5c4484f3f5b31cf22127fb39d8fc31e 100644 --- a/theme/funkwhale/static/css/style.css +++ b/theme/funkwhale/static/css/style.css @@ -306,3 +306,7 @@ img { .admonition a { margin-right: -12px; } + +hr { + background-color: #eee9e9; +} diff --git a/theme/funkwhale/templates/article.html b/theme/funkwhale/templates/article.html index 041a4dc8e16f5dd5340c054b5aeb7defe69bd5bf..fddb5a090b055ccf0e23ee34b7caa13f179e4530 100644 --- a/theme/funkwhale/templates/article.html +++ b/theme/funkwhale/templates/article.html @@ -15,10 +15,6 @@ title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1> <div class="entry-content blog-post"> {{ article.content }} - {% if article.donation %} - <br> - {{ donations }} - {% endif %} </div> <div class="post_list"> <span>By </span> @@ -36,6 +32,10 @@ dd{% endif %} </div> + {% if article.donation %} + <br> + {{ donations }} + {% endif %} </article> </section> {% endblock %} diff --git a/theme/funkwhale/templates/donations.html b/theme/funkwhale/templates/donations.html index 8bbc15531d5f72f8cc0b24a8ff688b01e865bd45..98904707b84bb5fb183b9a4018daf2babb76dd9d 100644 --- a/theme/funkwhale/templates/donations.html +++ b/theme/funkwhale/templates/donations.html @@ -1,7 +1,7 @@ {% block content %} -<div class="admonition"> - <p class="admonition-title">Want to help?</p> - <p>{{ DONATION_MESSAGES|random }} </p> - <a class="button is-primary" href="https://funkwhale.audio/en_US/support-us">Support us!</a> +<hr> +<div class="blog-post " style="text-align: center;"> + <p style="color: #333;">{{ DONATION_MESSAGES|random }} <a class="button is-primary" style="width: fit-content; vertical-align: middle; margin-left: 5px;" href="https://funkwhale.audio/en_US/support-us">Support Funkwhale</a></p> </div> +<hr> {% endblock %} \ No newline at end of file