Fix footer and page content overlapping

open-contracting-archive · Jul 9, 2020 · 1a778c4 · 1a778c4
1 parent 561dd98
commit 1a778c4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 41 deletions.
diff --git a/default/static/css/custom.css b/default/static/css/custom.css
@@ -62,25 +62,20 @@
     position: absolute;
     bottom: 0;
     width: 100%;
-    height: 100px;
+    height: 10rem;
     background-color: #222;
 }
-.footer.logo.home-footer {
-    position: relative;
-}
-.footer-brand.ocp-logo{
+.footer-brand.ocp-logo {
     max-width: 100px;
 }
-.footer-brand.ocp-logo svg
-{
+.footer-brand.ocp-logo svg {
     height: 80px;
     margin-top: 10px;
 }
 .page-container.ocp-page {
     position: relative;
     min-height: 100vh;
 }
-}
 .content-wrap.ocp-content {
-    padding-bottom: 2.5rem;
+    padding-bottom: 12rem;
 }
diff --git a/default/templates/default/base.html b/default/templates/default/base.html
@@ -49,35 +49,35 @@ <h1><a href="/" style="color: white;">{% trans "OCDS Toucan" %}</a> <small> {% b
           {# page content here #}
           {% block body %}{% endblock %}
         </div>
-        {% include 'default/logo.html' %}
-        <footer class="footer logo">
-          <div class="container">
-              <a class="footer-brand ocp-logo" href="http://open-contracting.org">
-                <svg style="margin-left: -30px;">
-                  <use xlink:href="#ocp-logo"/>
-                </svg>
-              </a>
-          </div>
-        </footer>
-    <script src="{% static "js/jquery-3.3.1.min.js" %}"></script>
-    <script src="{% static "js/bootstrap.min.js" %}"></script>
-    <script src="https://use.typekit.net/xpw3jps.js"></script>
-    <script src="{% static "js/language.js" %}"></script>
-    <script>
-        try{Typekit.load({ async: true });}catch(e){}
-    </script>
-    {# additional scripts here #}
-    {% block scripts %}{% endblock %}
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-35677147-3"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-
-      gtag('config', 'UA-35677147-3');
-    </script>
     </div>
+      {% include 'default/logo.html' %}
+      <footer class="footer logo">
+        <div class="container">
+            <a class="footer-brand ocp-logo" href="http://open-contracting.org">
+              <svg style="margin-left: -30px;">
+                <use xlink:href="#ocp-logo"/>
+              </svg>
+            </a>
+        </div>
+      </footer>
    </div>
   </body>
 </html>
+<script src="{% static "js/jquery-3.3.1.min.js" %}"></script>
+<script src="{% static "js/bootstrap.min.js" %}"></script>
+<script src="https://use.typekit.net/xpw3jps.js"></script>
+<script src="{% static "js/language.js" %}"></script>
+<script>
+    try{Typekit.load({ async: true });}catch(e){}
+</script>
+{# additional scripts here #}
+{% block scripts %}{% endblock %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-35677147-3"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-35677147-3');
+</script>
diff --git a/default/templates/default/index.html b/default/templates/default/index.html
@@ -148,7 +148,3 @@
 </div>
 </div>
 {% endblock %}
-
-{% block scripts %}
-<script> $('.footer').addClass('home-footer'); </script>
-{% endblock %}