From 204ca5e9de9a8f13f614fbbf6f04fb206f6b6b8e Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 19 Oct 2021 15:46:56 +1100 Subject: [PATCH] Move donation sidebar to pop out at bottom. --- www/conservancy/static/css/conservancy.css | 28 ++---- .../templates/base_compliance.html | 30 +++---- www/conservancy/templates/base_press.html | 28 +++--- .../templates/supporter/index.html | 87 ++++++++++--------- 4 files changed, 79 insertions(+), 94 deletions(-) diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css index 6a936f6c..64998248 100644 --- a/www/conservancy/static/css/conservancy.css +++ b/www/conservancy/static/css/conservancy.css @@ -131,17 +131,14 @@ text-decoration: none; color: #557733; /* FIXME: We should do this: */ /* http://www.waypointarts.com/blog/2013/06/29/fixing-a-side-bar-while-scrolling-until-bottom */ .donate-sidebar { - position: fixed; - top: 180px; - right: 2%; - width: 18%; -} -@media all and (max-width: 725px) { - .donate-sidebar { display: none; } - .content-with-donate-sidebar { - align: center; - width: 100%; - } + background: var(--light-green) no-repeat; + position: sticky; + bottom: 0; + width: auto; + padding: 0.5rem 1rem; + margin: 2rem -1rem 0; + border-radius: 8px 8px 0 0; + border: 1px solid #90d468; } p.footnote { @@ -279,10 +276,6 @@ body > header { margin-left: .5rem; } - -#mainContent { - overflow: auto; -} #sidebar + #mainContent { float: left; } @@ -328,11 +321,6 @@ body > header { text-align: center; } -.content-with-donate-sidebar { - align: left; - width: 80%; -} - #container #mainContent { max-width: 50em; margin: 0; diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html index 6ff40331..a4b03da0 100644 --- a/www/conservancy/templates/base_compliance.html +++ b/www/conservancy/templates/base_compliance.html @@ -8,21 +8,6 @@ {% endblock %} {% block outercontent %} -
{% block content %}{% endblock %}
-
+ + {% endblock %} diff --git a/www/conservancy/templates/base_press.html b/www/conservancy/templates/base_press.html index f76366e6..e15cf089 100644 --- a/www/conservancy/templates/base_press.html +++ b/www/conservancy/templates/base_press.html @@ -8,21 +8,6 @@ {% endblock %} {% block outercontent %} -
+ {% endblock %} diff --git a/www/conservancy/templates/supporter/index.html b/www/conservancy/templates/supporter/index.html index 70c0030b..768c658d 100644 --- a/www/conservancy/templates/supporter/index.html +++ b/www/conservancy/templates/supporter/index.html @@ -1,4 +1,5 @@ {% extends "base_conservancy.html" %} +{% load static %} {% block subtitle %}Support Conservancy - {% endblock %} {% block category %}sustainer{% endblock %} @@ -14,51 +15,9 @@

Home / Who We Are

-
- + {% if partial_amount > 0 %} {% include "supporter/form_partial.html" with form_id="annual" min_amt=minimum_amount partial_amt=partial_amount article="an" only %} {% else %} @@ -214,6 +173,7 @@ you products this end of year season, we offer you a chance to donate to somethi your money to work fighting for the freedom and rights of all software users.

+
Zack, Karen, John and Jim pose, mostly wearing the vintage t-shirt!

Vintage-shirt-wearing Sustainers pose with Karen!
From left: Stefano “Zack” Zacchiroli, Karen M. Sandler, John Sullivan, and Jim Wright

@@ -270,10 +230,51 @@ $256 or more between 2020-01-15 and 2021-01-15 can receive one of these vintage

You too can look cool in the vintage design. Or maybe your original has faded and you're ready to spruce up with a new one? As we said, supplies are limited so make a big donation today, support Conservancy, and show you've always been old-school — or just want to look that way!

+
+ {% endblock %}