From 4b2bfccbe065b9a3c2da329b8c63b0a9c651e739 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 19 Oct 2021 16:49:46 +1100
Subject: [PATCH] Fix a glitch in the pop-out donations box.

---
 .../static/copyleft-compliance/about.html      |  1 -
 www/conservancy/static/css/conservancy.css     | 18 ++++++++++++------
 www/conservancy/templates/base_compliance.html |  1 +
 www/conservancy/templates/base_press.html      |  4 +++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/www/conservancy/static/copyleft-compliance/about.html b/www/conservancy/static/copyleft-compliance/about.html
index 0cc57351..831d3f7f 100644
--- a/www/conservancy/static/copyleft-compliance/about.html
+++ b/www/conservancy/static/copyleft-compliance/about.html
@@ -151,5 +151,4 @@ Conservancy should contact <a href="mailto:debian-services@sfconservancy.org">&l
   class="donate-now">donations</a> in support of our GPL Compliance Projects,
   and we encourage you to become a <a href="/sustainer/">an official
   Supporter of Software Freedom Conservancy</a>. </p>
-</div>
 {% endblock %}
diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css
index 64998248..99107061 100644
--- a/www/conservancy/static/css/conservancy.css
+++ b/www/conservancy/static/css/conservancy.css
@@ -136,11 +136,21 @@ text-decoration: none; color: #557733;
   bottom: 0;
   width: auto;
   padding: 0.5rem 1rem;
-  margin: 2rem -1rem 0;
+  margin: 2rem -0.5rem 0;
   border-radius: 8px 8px 0 0;
   border: 1px solid #90d468;
 }
 
+.donate-sidebar:hover {
+  background: #a0d870;
+}
+
+@media screen and (min-width: 30em) {
+  .donate-sidebar {
+    margin: 2rem -1rem 0;
+  }
+}
+
 p.footnote {
     font-size: 85%;
 }
@@ -276,10 +286,6 @@ body > header {
   margin-left: .5rem;
 }
 
-#sidebar + #mainContent {
-    float: left;
-}
-
 #progressbar {
     height: 1.8em;
 }
@@ -331,7 +337,6 @@ body > header {
 #container #sidebar {
   background-color: #ccd4a3;
   padding: 1px 0.5rem 0.25rem;
-  flex: 1 0 15em;
   margin-bottom: 1rem;
 }
 
@@ -340,6 +345,7 @@ body > header {
     display: flex;
   }
   #container #sidebar {
+  flex: 1 0 15em;
     margin-right: 1rem;
   }
 }
diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html
index a4b03da0..06e44e36 100644
--- a/www/conservancy/templates/base_compliance.html
+++ b/www/conservancy/templates/base_compliance.html
@@ -39,4 +39,5 @@
       this work without ongoing support from donors like you!</p>
   </details>
 </div>
+</div>
 {% endblock %}
diff --git a/www/conservancy/templates/base_press.html b/www/conservancy/templates/base_press.html
index e15cf089..46e39aba 100644
--- a/www/conservancy/templates/base_press.html
+++ b/www/conservancy/templates/base_press.html
@@ -23,7 +23,8 @@
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
-</div></div>
+
+    </div>
 <div class="donate-sidebar">
   <details>
     <summary>Support Now!</summary>
@@ -36,5 +37,6 @@
       Sustainer <strong>right now</strong></span></a>.  We can't sustain
       this work without ongoing support from donors like you!</p>
   </details>
+    </div>
 </div>
 {% endblock %}