diff --git a/__pycache__/pelicanconf.cpython-39.pyc b/__pycache__/pelicanconf.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cdee948eee124d1e28771f4b7cb4808c0db5333d Binary files /dev/null and b/__pycache__/pelicanconf.cpython-39.pyc differ diff --git a/content/design-work.md b/content/design-work.md index 32caf4f675cabeebfa2389200fd4998d0deaa816..1964c11f687584ba2c80d3b5394d06a5eb4cc257 100644 --- a/content/design-work.md +++ b/content/design-work.md @@ -4,7 +4,6 @@ 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 0a6d34d22240a84c14af9d946c174274941b5416..aab2c9e3d6c311d29b839c6ebff9609a3caac413 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -46,14 +46,13 @@ MARKDOWN = { 'extensions' : ['toc'], 'extension_configs': { 'markdown.extensions.toc': {'anchorlink': 'true'}, - 'markdown.extensions.admonition': {}, }, 'output_format': 'html5', } DONATION_MESSAGES = [ - '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?' + 'Consider donating to help us out!', + 'Help us keep the lights on around here!', + 'Consider donating to help us keep going!', + 'Love Funkwhale? Consider donating!' ] diff --git a/theme/funkwhale/static/css/style.css b/theme/funkwhale/static/css/style.css index dac67c8ae5c4484f3f5b31cf22127fb39d8fc31e..5403cec5c135eaacde9f582c3c218f09cb4d33b0 100644 --- a/theme/funkwhale/static/css/style.css +++ b/theme/funkwhale/static/css/style.css @@ -273,40 +273,18 @@ img { filter: invert(100%); } -.admonition { - clear: both; - background: #e7f2fa; - padding-top: 12px; - padding-left: 12px; - padding-right: 12px; - line-height: 24px; - margin-bottom: 24px; - box-sizing: border-box; - text-align: right; - border-radius: 8px; -} - -.admonition p { - text-align: left; -} - -.admonition-title { - font-weight:700; - display:block; - color:#fff; - background:#6ab0de; - padding:6px 12px; - margin:-12px -12px 12px; - box-sizing: border-box; - text-align: left; - border-top-left-radius: 8px; - border-top-right-radius: 8px; +hr { + background-color: #eee9e9; } -.admonition a { - margin-right: -12px; +#donations { + text-align: center; + color: #333; } -hr { - background-color: #eee9e9; +#donation-button { + width: fit-content; + vertical-align: middle; + margin-left: 5px; + text-decoration: none; } diff --git a/theme/funkwhale/templates/article.html b/theme/funkwhale/templates/article.html index fddb5a090b055ccf0e23ee34b7caa13f179e4530..b4b7ef2f3906ce1842f2fd7c02e63d90435235ca 100644 --- a/theme/funkwhale/templates/article.html +++ b/theme/funkwhale/templates/article.html @@ -33,8 +33,7 @@ </div> {% if article.donation %} - <br> - {{ donations }} + {{ donations }} {% endif %} </article> </section> diff --git a/theme/funkwhale/templates/donations.html b/theme/funkwhale/templates/donations.html index 98904707b84bb5fb183b9a4018daf2babb76dd9d..40731adee8c99bf1481168a94cbba04d1888f42d 100644 --- a/theme/funkwhale/templates/donations.html +++ b/theme/funkwhale/templates/donations.html @@ -1,7 +1,7 @@ {% block content %} <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 id="donations" class="blog-post "> + <p>{{ DONATION_MESSAGES|random }} <a id="donation-button" class="button is-primary" href="https://funkwhale.audio/en_US/support-us">Support Funkwhale</a></p> </div> <hr> {% endblock %} \ No newline at end of file