From bdda85c237ac1718495187431ec922ef3b07b953 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 15 Oct 2021 21:43:43 +1100
Subject: [PATCH] Apply max widths and margins to all pages.

Due to the varying types of layouts used and the short time-frame the best
option seems to set a max-width etc. around the "outercontent" block. For now
this means we can't do "full bleed" body content, but that's not currently used
anyway.
---
 www/conservancy/static/css/conservancy.css      | 8 ++++----
 www/conservancy/static/error/401/index.html     | 2 +-
 www/conservancy/static/error/403/index.html     | 2 +-
 www/conservancy/static/error/404/index.html     | 3 +--
 www/conservancy/templates/500.html              | 2 +-
 www/conservancy/templates/base_conservancy.html | 9 ++++++---
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css
index 8357d108..1078c763 100644
--- a/www/conservancy/static/css/conservancy.css
+++ b/www/conservancy/static/css/conservancy.css
@@ -147,7 +147,7 @@ p.footnote {
 }
 
 h1 { margin-top: .75em; margin-bottom: .5em; }
-/* h2 { margin-top: .75em; margin-bottom: .5em; } */
+h2 { margin-top: .75em; margin-bottom: .5em; }
 h3 { margin-top: .6em; margin-bottom: .4em; }
 
 #mainContent ul, #mainContent ol { padding-left: 1.5em; }
@@ -233,16 +233,16 @@ body > header {
 #navbar li:hover ul {
   display: block;
 }
-#navbar li:last-child ul {
+/* Right-align the second last and last sub-menus. */
+#navbar li:nth-last-child(2) ul, #navbar li:nth-last-child(1) ul {
   left: auto;
   right: 0;
   text-align: right;
 }
 
 
-
 #mainContent {
-  margin: 0 auto;
+  overflow: auto;
 }
 #sidebar + #mainContent {
     float: left;
diff --git a/www/conservancy/static/error/401/index.html b/www/conservancy/static/error/401/index.html
index 672f339f..518eaff1 100644
--- a/www/conservancy/static/error/401/index.html
+++ b/www/conservancy/static/error/401/index.html
@@ -3,7 +3,7 @@
 
 <h1>401 Error</h1>
 
-<p>The page you request at <tt>sfconservancy.org</tt>
+<p>The page you requested at <tt>sfconservancy.org</tt>
 requires authorization.  Please use the navigation items to find a
 page that you are authorized to see.</p>
 
diff --git a/www/conservancy/static/error/403/index.html b/www/conservancy/static/error/403/index.html
index 936dff5f..42a783a9 100644
--- a/www/conservancy/static/error/403/index.html
+++ b/www/conservancy/static/error/403/index.html
@@ -3,7 +3,7 @@
 
 <h1>403 Error</h1>
 
-<p>The page you request at <tt>sfconservancy.org</tt>
+<p>The page you requested at <tt>sfconservancy.org</tt>
 does not have read permission.  Please use the navigation items to
 find a page that you are authorized to see.</p>
 
diff --git a/www/conservancy/static/error/404/index.html b/www/conservancy/static/error/404/index.html
index 952f852c..a9e3b15b 100644
--- a/www/conservancy/static/error/404/index.html
+++ b/www/conservancy/static/error/404/index.html
@@ -3,8 +3,7 @@
 
 <h1>404 Error</h1>
 
-<p>The page you request at <tt>sfconservancy.org</tt>
+<p>The page you requested at <tt>sfconservancy.org</tt>
 was not found.  Please use the navigation items to find a page that is
 available.</p>
-
 {% endblock %}
diff --git a/www/conservancy/templates/500.html b/www/conservancy/templates/500.html
index 42098007..66fb0d23 100644
--- a/www/conservancy/templates/500.html
+++ b/www/conservancy/templates/500.html
@@ -3,7 +3,7 @@
 
 <h1>500 Error</h1>
 
-<p>The page you request at <tt>sfconservancy.org</tt> is
+<p>The page you requested at <tt>sfconservancy.org</tt> is
 unavailable due to an internal server error.</p>
 
 {% endblock %}
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index b679fa27..24f2d127 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -46,7 +46,7 @@
       </div>
     </header>
 
-    <div id="navbar-outer">
+    <div id="navbar-outer" class="mb2">
       <div id="navbar" class="center mw8 nested-list-resetb">
         <ul class="f5 b ttu flex flex-wrap justify-center">
           <!-- Remaining previous menu items
@@ -67,7 +67,7 @@
           <li class="who"><a href="#fixme">Who <span class="dn di-ns">we are</span></a>
             <ul>
               <li><a href="/sponsors/">Sponsors</a></li>
-              <li><a href="/sustainers/">Sustainers</a></li>
+              <li><a href="/sustainer/">Sustainers</a></li>
               <li><a href="#fixme">Board of Directors</a></li>
               <li><a href="#fixme">Staff</a></li>
               <li><a href="#fixme">Evaluation Committee</a></li>
@@ -173,7 +173,10 @@
 {% endwith %}
 {% endif %}
 
-      {% block outercontent %}<div id="mainContent" class="mw8"> {% block content %}{% endblock %}</div>{% endblock %}
+    <div class="mw8 center ph2 ph3-ns">
+      {% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}
+    </div>
+
     <div id="conservancyfooter" class="mt4 pt3 ph3 bg-light-gray">
       <p>Connect with Conservancy on
         <a href="https://mastodon.technology/@conservancy">Mastodon</a>,