From 97afa095eb40b33ae7c4684edefe1773e1fd577a Mon Sep 17 00:00:00 2001
From: Ciaran Ainsworth <ciaranainsworth@outlook.com>
Date: Thu, 10 Mar 2022 20:31:48 +0100
Subject: [PATCH] Move styles and remove emoji
---
__pycache__/pelicanconf.cpython-39.pyc | Bin 0 -> 992 bytes
content/design-work.md | 1 -
pelicanconf.py | 9 +++--
theme/funkwhale/static/css/style.css | 42 ++++++-----------------
theme/funkwhale/templates/article.html | 3 +-
theme/funkwhale/templates/donations.html | 4 +--
6 files changed, 17 insertions(+), 42 deletions(-)
create mode 100644 __pycache__/pelicanconf.cpython-39.pyc
diff --git a/__pycache__/pelicanconf.cpython-39.pyc b/__pycache__/pelicanconf.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cdee948eee124d1e28771f4b7cb4808c0db5333d
GIT binary patch
literal 992
zcmYe~<>g{vU|{H-#h28>!octt#6iX^3=9ko3=9m#DGUq@DGX5zDU4B!DNIpJDa=vK
zDJ)SeDXdYfDQr<}DeO_~DI8H8DV$N9DO^!pDO^$9DO^!JDO^#!DO^!}Dcn)~DLhdE
zDZEjFDSYXSDf}q{nT(kXDS~sDQiM{3=P*YJrEmo^Xo^&cxRvH*muDpAq$)V)=j5a&
zmt>ZuR`DT3opSQiZ!zjs@t0(z=BDbW!IXzo$?8LdGIJBtQ;YR;^3(Hmlk;=(i;DG%
z%hIcSLo!ko5axiSbrjN46H7{qGV{_EN-|Ov$`i{{b27726^aXT5{okw^3xO&6~K;B
zFIGq@%1=zr04Yt&%+tHYo}8aolA2di#p_yHlwXjl@041UlbLsmDK*belTni?iak6v
zsW`JFwMrtRq@<wON+01?y~NU#%zS-KMos1@j@-oJlKhnXyeb8_y8L2@kY0XKy1oP4
zi&g$0FZe>$E1>%zQ6V|8s3bo>PXT76da*)AYGR5)YF=4tPJRK%?I3UFq?VMV7Ag4Z
zy#&SoE#{K^<S4GhyyT30kPotNv6K{*rfM=(iRUI3WvAqq=jo+Zl%(brXXfV>>y_ju
zSIJ?MNKDDi&&w>y%+I^Uno*LQW2(t~iwmLgmLQxRpPZkUmYH6Bi#NZtq@c7UJ}ti}
zH?c%h_!gUEXo!b@&@GN&&k$EXM_<=l>>yTXkk2jF5D!;h*C>7$&)@(b$H@5LP+woi
zpvWjT$1ukb$Dk-K2p#X}6LO0sz%j(*7DtGuuWOXQpX)6i7gsmOP@j-^A4fm;TfA<r
zt}gM8K0fh|A^yI%gq$5iT;2VHBI6<AATiO9AV<GoAIA_+e?KH)0f_UEMEH?Kf`Wsi
zSbaSGyo00Ig8iL69er*I!E6q2bocZFn|F)D*D=W3#XsC{B}0)U0|SKk#aED;lbM{D
z2MQa#g34PQHo5sJr8%i~pj=pNz`(%3!pOqN!UQ3i{xh+#FtISPFoXFZ8D<t{77i9R
O7A7`ErhhCfOuqn=lQMz;
literal 0
HcmV?d00001
diff --git a/content/design-work.md b/content/design-work.md
index 32caf4f..1964c11 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 0a6d34d..aab2c9e 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 dac67c8..5403cec 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 fddb5a0..b4b7ef2 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 9890470..40731ad 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
--
GitLab