Changeset - b36800e0784f
[Not reviewed]
0 6 0
Ben Sturmfels (bsturmfels) - 8 months ago 2021-10-15 10:43:43
ben@sturm.com.au
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.
6 files changed with 14 insertions and 12 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/css/conservancy.css
Show inline comments
...
 
@@ -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;
www/conservancy/static/error/401/index.html
Show inline comments
...
 
@@ -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>
 

	
www/conservancy/static/error/403/index.html
Show inline comments
...
 
@@ -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>
 

	
www/conservancy/static/error/404/index.html
Show inline comments
...
 
@@ -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 %}
www/conservancy/templates/500.html
Show inline comments
...
 
@@ -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 %}
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -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>,
0 comments (0 inline, 0 general)