diff --git a/www/conservancy/static/activities/index.html b/www/conservancy/static/activities/index.html index 0cc0eb3dc0b62f3c72ba81f98557c6319885eae3..1c5d5e179a63afd45d1f579f69c8dc64ce439f90 100644 --- a/www/conservancy/static/activities/index.html +++ b/www/conservancy/static/activities/index.html @@ -11,23 +11,6 @@ {% block outercontent %}
-
{% block content %}

What We Do

@@ -67,9 +50,24 @@ the Outreachy initiative that offers paid internships in FOSS for contributors who have faced systemic bias in their efforts to join the FOSS community.

- - {% endblock %} -

+
+
- {% endblock %} +{% endblock %} diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css index b155e7290e660e347bf488c090ce4e741af44c88..f65932aa01045ab2302a9cf49f5fd725af73f9ae 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 61d1a13a970059ab333ff69388e2a41d10aeec84..c84f838a872f3df8de222d72e17155b13eb5a97c 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 %}
+
{% block content %}{% endblock %}
-
{% block content %}{% endblock %} -
{% endblock %} diff --git a/www/conservancy/templates/base_blog.html b/www/conservancy/templates/base_blog.html index d42828db6503a2d608e030b82640ff20517459d0..71d90a40a04b74c6cb9cd1bb6958e2995a39e531 100644 --- a/www/conservancy/templates/base_blog.html +++ b/www/conservancy/templates/base_blog.html @@ -8,6 +8,7 @@ {% block outercontent %}
+
{% block content %}{% endblock %}
-
{% block content %}{% endblock %} -
{% endblock %} diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html index d1c2ad6721af8a23fc86a3a17fd22956b9e46598..60a18b55ee9f79fb14e2fcd6755275220607e378 100644 --- a/www/conservancy/templates/base_compliance.html +++ b/www/conservancy/templates/base_compliance.html @@ -11,6 +11,7 @@ {% block outercontent %}
+
{% block content %}{% endblock %}
-
{% block content %}{% endblock %} -