From 68f5f1fa2cd1c0f05a848c1f3289779aafcfbd30 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 19 Nov 2021 17:02:59 +1100
Subject: [PATCH] Move sub-menus to RHS and re-enable on mobile.

---
 www/conservancy/static/activities/index.html  | 40 +++++++++----------
 www/conservancy/static/css/conservancy.css    | 32 +++++++--------
 www/conservancy/templates/base_about.html     |  3 +-
 www/conservancy/templates/base_blog.html      |  3 +-
 .../templates/base_compliance.html            |  3 +-
 .../templates/base_conservancy.html           |  6 +--
 www/conservancy/templates/base_learn.html     |  3 +-
 www/conservancy/templates/base_press.html     |  4 +-
 www/conservancy/templates/base_projects.html  |  3 +-
 www/conservancy/templates/base_vizio.html     |  3 +-
 www/conservancy/templates/frontpage.html      |  2 +-
 .../templates/news/pressrelease_list.html     | 28 ++++++-------
 12 files changed, 57 insertions(+), 73 deletions(-)

diff --git a/www/conservancy/static/activities/index.html b/www/conservancy/static/activities/index.html
index 0cc0eb3d..1c5d5e17 100644
--- a/www/conservancy/static/activities/index.html
+++ b/www/conservancy/static/activities/index.html
@@ -11,23 +11,6 @@
 {% block outercontent %}
 <div class="content-with-donate-sidebar">
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
-            <h2>What We Do</h2>
-            {% include 'submenus/what_we_do_partial.html' %}
-            <h2>Vizio Lawsuit</h2>
-            <ul>
-            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
-            <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
-            <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
-            <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
-            </ul>
-            <h2>Resources for Journalists on Vizio</h2>
-            <ul>
-            <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
-            <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
-            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
-            </ul>
-         </div>
          <div id="mainContent">
            {% block content %}
            <h1>What We Do</h1>
@@ -67,9 +50,24 @@
            the <a href="https://outreachy.org/">Outreachy initiative</a> that
            offers paid internships in FOSS for contributors who have faced
            systemic bias in their efforts to join the FOSS community.<p>
-
-
            {% endblock %}
-               </div>
+         </div>
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
+            <h2>What We Do</h2>
+            {% include 'submenus/what_we_do_partial.html' %}
+            <h2>Vizio Lawsuit</h2>
+            <ul>
+            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
+            <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
+            <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
+            <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
+            </ul>
+            <h2>Resources for Journalists on Vizio</h2>
+            <ul>
+            <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
+            <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
+            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
+            </ul>
+         </div>
     </div>
-           {% endblock %}
+{% endblock %}
diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css
index b155e729..f65932aa 100644
--- a/www/conservancy/static/css/conservancy.css
+++ b/www/conservancy/static/css/conservancy.css
@@ -136,7 +136,7 @@ text-decoration: none; color: #557733;
   bottom: 0;
   width: auto;
   padding: 0.5rem 1rem;
-  margin: 2rem -0.5rem 0;
+  margin: 0 -1rem;
   border-radius: 8px 8px 0 0;
   border: 1px solid #90d468;
 }
@@ -145,18 +145,6 @@ text-decoration: none; color: #557733;
   background: #a0d870;
 }
 
-@media screen and (min-width: 30em) {
-  .donate-sidebar {
-    margin: 2rem -1rem 0;
-  }
-}
-
-@media screen and (max-width: 52em) { 
-  #sidebar { 
-      display: none; 
-  } 
-} 
-
 p.footnote {
     font-size: 85%;
 }
@@ -340,15 +328,16 @@ body > header {
 
 #container #mainContent {
     max-width: 50em;
-    margin: 0;
+    margin: 0 0 2rem;
     padding: 0;
     background: #ffffff;
     flex: 1 1 auto;
 }
+
 #container #sidebar {
   background-color: #e6eae1;
-  padding: 1px 0.5rem 0.25rem;
-  margin-bottom: 1rem;
+  padding: 1px 0.5rem 2rem;
+  margin: 1rem -1rem 0;
 }
 
 @media screen and (min-width: 30em) {
@@ -356,8 +345,8 @@ body > header {
     display: flex;
   }
   #container #sidebar {
-  flex: 1 0 15em;
-    margin-right: 1rem;
+    flex: 1 0 15em;
+    margin: 1rem 0rem 1rem 2rem;
   }
 }
 
@@ -437,6 +426,13 @@ body > header {
   border-top: 1px solid #ccc;
   text-align: center;
   overflow: auto;
+  margin: 0;
+}
+
+@media screen and (min-width: 30em) {
+  #conservancyfooter {
+    margin: 0;
+  }
 }
 
 .continued {
diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html
index 61d1a13a..c84f838a 100644
--- a/www/conservancy/templates/base_about.html
+++ b/www/conservancy/templates/base_about.html
@@ -2,11 +2,10 @@
 {% block category %}WhoWeAre{% endblock %}
 {% block outercontent %}
     <div id="container">
+         <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>Who We Are</h2>
             {% include 'submenus/who_we_are_partial.html' %}
          </div>
-               <div id="mainContent">{% block content %}{% endblock %}
-               </div>
    </div>
 {% endblock %}
diff --git a/www/conservancy/templates/base_blog.html b/www/conservancy/templates/base_blog.html
index d42828db..71d90a40 100644
--- a/www/conservancy/templates/base_blog.html
+++ b/www/conservancy/templates/base_blog.html
@@ -8,6 +8,7 @@
 
 {% block outercontent %}
  <div id="container">
+     <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 {% if all_year_list %}
 
@@ -36,7 +37,5 @@
 {% endfor %}
 </ul>
          </div>
-               <div id="mainContent">{% block content %}{% endblock %}
-               </div>
    </div>
 {% endblock %}
diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html
index d1c2ad67..60a18b55 100644
--- a/www/conservancy/templates/base_compliance.html
+++ b/www/conservancy/templates/base_compliance.html
@@ -11,6 +11,7 @@
 {% block outercontent %}
 <div class="content-with-donate-sidebar">
     <div id="container">
+         <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
@@ -37,8 +38,6 @@
             <li class="CopyleftOrg"><a href="https://copyleft.org/">copyleft.org</a></li>
             </ul>
          </div>
-               <div id="mainContent">{% block content %}{% endblock %}
-               </div>
     </div>
     <div class="donate-sidebar">
   <details>
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 06f45983..9a61beaf 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -109,7 +109,7 @@
 {% if sitefundgoal and sitefundgoal.fundraiser_so_far_amount and datetime_now < sitefundgoal_endtime %}
 {% with this_match_goal=sitefundgoal.fundraiser_goal_amount this_match_so_far=sitefundgoal.fundraiser_so_far_amount %}
 {% with this_match_remaining=this_match_goal|subtract:this_match_so_far sitefundgoal_timeleft=sitefundgoal_endtime|subtract:datetime_now %}
-    <div class="fundraiser-top-text ph2 ph3-ns pt2 pb3">
+    <div class="fundraiser-top-text ph3 pt2 pb3">
       <div class="mw8 center ph2 ph4-ns">
       <div class="mt2 mb3 tc">
         {% if this_match_remaining <= 0 %}
@@ -157,11 +157,11 @@
 {% endwith %}
 {% endif %}
 
-    <div class="mw8 center ph2 ph3-ns">
+    <div class="mw8 center ph2 ph3">
       {% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}
     </div>
 
-    <div id="conservancyfooter" class="mt4 pt3 ph3 bg-light-gray">
+    <div id="conservancyfooter" class="mt4-ns pt3 ph3 bg-light-gray">
       <p>Connect with Conservancy on
         <a href="https://mastodon.technology/@conservancy">Mastodon</a>,
         <a href="https://twitter.com/conservancy">Twitter</a>,
diff --git a/www/conservancy/templates/base_learn.html b/www/conservancy/templates/base_learn.html
index d7d15396..d4d2a2d6 100644
--- a/www/conservancy/templates/base_learn.html
+++ b/www/conservancy/templates/base_learn.html
@@ -2,6 +2,7 @@
 {% block category %}Learn{% endblock %}
 {% block outercontent %}
     <div id="container">
+         <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>Learn</h2>
             {% include 'submenus/learn_partial.html' %}
@@ -12,7 +13,5 @@
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
    </div>
-               <div id="mainContent">{% block content %}{% endblock %}
-               </div>
 </div>
 {% endblock %}
diff --git a/www/conservancy/templates/base_press.html b/www/conservancy/templates/base_press.html
index 0db97c59..ec60a119 100644
--- a/www/conservancy/templates/base_press.html
+++ b/www/conservancy/templates/base_press.html
@@ -11,6 +11,7 @@
 {% block outercontent %}
 <div class="content-with-donate-sidebar">
     <div id="container">
+         <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
@@ -23,9 +24,6 @@
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
          </div>
-               <div id="mainContent">{% block content %}{% endblock %}
-               </div>
-
     </div>
 <div class="donate-sidebar">
   <details>
diff --git a/www/conservancy/templates/base_projects.html b/www/conservancy/templates/base_projects.html
index 39d99668..bc366a75 100644
--- a/www/conservancy/templates/base_projects.html
+++ b/www/conservancy/templates/base_projects.html
@@ -1,6 +1,7 @@
 {% extends "base_conservancy.html" %}
 {% block outercontent %}
     <div id="container">
+         <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
@@ -12,7 +13,5 @@
             <li class="Policies"><a href="/projects/policies/">Member Project Policies</a></li>
             </ul>
          </div>
-               <div id="mainContent">{% block content %}{% endblock %}
-               </div>
    </div>
 {% endblock %}
diff --git a/www/conservancy/templates/base_vizio.html b/www/conservancy/templates/base_vizio.html
index ef72d530..c5600a31 100644
--- a/www/conservancy/templates/base_vizio.html
+++ b/www/conservancy/templates/base_vizio.html
@@ -11,6 +11,7 @@
 {% block outercontent %}
 <div class="content-with-donate-sidebar">
     <div id="container">
+         <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="VizioTopBar {% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
@@ -30,8 +31,6 @@
             </ul>
             <h2><ul><li class="ComplianceMain"><a href="/copyleft-compliance/index.html">More About Copyleft Compliance</a></li></ul></h2>
          </div>
-               <div id="mainContent">{% block content %}{% endblock %}
-               </div>
     </div>
     <div class="donate-sidebar">
   <details>
diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html
index fba6fe4a..4f910536 100644
--- a/www/conservancy/templates/frontpage.html
+++ b/www/conservancy/templates/frontpage.html
@@ -43,7 +43,7 @@ strategies that defend FOSS (such as copyleft). <a href="/about" class="orange">
   </section>
 </div>
 
-<div class="mt3 mh2-ns flex-ns">
+<div class="mt3 mh2-ns mb4 flex-ns">
   <div class="w-70-ns mh2">
 <section class="mh0 pa3 bg-light-blue ba b--gray">
   <h2 class="f4 ma0 ttu"><a href="/news/2021/oct/28/2021-DMCA-final-exemptions-win/">Software Freedom Conservancy's DMCA Exemption Requests Granted</a></h2>
diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html
index c670cad0..9dfab489 100644
--- a/www/conservancy/templates/news/pressrelease_list.html
+++ b/www/conservancy/templates/news/pressrelease_list.html
@@ -3,19 +3,6 @@
 
 {% block outercontent %}
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
-         <h2>News Index by Year</h2>
-         <ul>
-         {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
-         </ul>
-         <h2>Resources for Journalists</h2>
-         <ul>
-            <li class="News"><a href="/news/">News</a></li>
-            <li class="PressKit"><a href="/press/">Press Kit</a></li>
-            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
-         </ul>
-
-         </div>
          <div id="mainContent">
            <div class="breadcrumbs">
              <p><a href="/">Home</a> / <a href="/news/">News</a></p>
@@ -39,7 +26,18 @@
 </p>
 {% if news.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in news.paginator.page_range %}{% ifequal pagenum news.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}</p>{% endif %}
          </div>
- </div>
-<div class="clear"></div>
 
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
+         <h2>News Index by Year</h2>
+         <ul>
+         {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
+         </ul>
+         <h2>Resources for Journalists</h2>
+         <ul>
+            <li class="News"><a href="/news/">News</a></li>
+            <li class="PressKit"><a href="/press/">Press Kit</a></li>
+            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
+         </ul>
+         </div>
+ </div>
 {% endblock %}