From cf0200f69a41cd282a7ad4e19fc1f5c94c9d2238 2021-10-19 05:49:46
From: Ben Sturmfels <ben@sturm.com.au>
Date: 2021-10-19 05:49:46
Subject: [PATCH] Fix a glitch in the pop-out donations box.

---

diff --git a/www/conservancy/static/copyleft-compliance/about.html b/www/conservancy/static/copyleft-compliance/about.html
index 0cc57351349860c4c1546e460acd61a074e643fc..831d3f7feedbf7217c37e311b8de587f19eedaba 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 64998248eb325f2565a83e64ceb3400aeda416df..9910706180298de7c359125bfc0a2005414c6a8e 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 a4b03da05d6f90bae7793b495ea8a719e38561cd..06e44e3622bb731cb4e869b669bdf447ef46bd6b 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 e15cf089af81be5c792c8b1c6d84a37a2234ca3b..46e39aba434c13005459f79c21b448e85eaab7da 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 %}