Changed footer back to they way it was

5defb4a2 · Jason D Yeomans · 79785aa1 · 5defb4a2 · 5defb4a2 · 5defb4a2
Commit 5defb4a2 authored Jan 09, 2015 by Jason D Yeomans
3 changed files
--- a/roomlist/static/css/style.css
+++ b/roomlist/static/css/style.css
 body {
  padding-top: 70px;
+  height: 100%;
 }

 .footer {
-  position: absolute;
-  bottom: 0;
  width: 100%;
  /* Set the fixed height of the footer here */
  height: 80px;

--- a/roomlist/templates/layouts/base.html
+++ b/roomlist/templates/layouts/base.html
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
        "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
+
 <head>
  <meta charset="utf-8">
-  <meta name="description" content="Find your on campus neighbors">
-  {% load staticfiles %}
+  <meta name="description" content="Find your on campus neighbors"> {% load staticfiles %}
  <link href="/static/css/bootstrap.min.css" rel="stylesheet" media="screen">
  <link href="/static/css/style.css" rel="stylesheet" media="screen">
  <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
@@ -13,16 +13,17 @@
  <link rel="icon" href="/static/img/favicon.ico">
  <title> {% block title %} {% endblock %}</title>
 </head>
-  <body>
-    <div id = "wrap">
+
+<body>
+  <div id="wrap">
    {% include 'layouts/navbar.html' %}
-      <div class="container">
-        {% block content %}
-        {% endblock %}
-      </div>
+    <div class="container">
+      {% block content %} {% endblock %}
    </div>
-    <div class="footer">
-      {% include 'layouts/footer.html' %}
-    </div>
-  </body>
+  </div>
+  <div class="footer">
+    {% include 'layouts/footer.html' %}
+  </div>
+</body>
+
 </html>
--- a/roomlist/templates/layouts/footer.html
+++ b/roomlist/templates/layouts/footer.html
-<footer class="footer">
-  <hr>
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-12">
-        <div class="col-md-8">
-          <a href="{% url 'about' %}" target="_blank">About</a> &middot;
-          <a href="{% url 'contact' %}" target="_blank">Contact</a> &middot;
-          <a href="http://srct.gmu.edu/documents/usage_policy" target="_blank">Terms of Service</a> &middot;
-          <a href="{% url 'privacy' %}" target="_blank">Privacy</a>
-        </div>
-        <div class="col-md-4">
-          <p class="muted pull-right">A <a href="http://srct.gmu.edu/projects" target="_blank">project</a> of <a href="http://www.gmu.edu/" target="_blank">Mason</a> <a href="http://srct.gmu.edu/" target="_blank"><strong>SRCT</strong></a>. <a href="https://www.gnu.org/licenses/gpl-3.0.html" target="_blank">Contribute</a> to <a href="http://git.gmu.edu/srct/roomlist/" target="_blank">our code</a>.</p>
-        </div>
+<hr>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12">
+      <div class="col-md-8">
+        <a href="{% url 'about' %}" target="_blank">About</a> &middot;
+        <a href="{% url 'contact' %}" target="_blank">Contact</a> &middot;
+        <a href="http://srct.gmu.edu/documents/usage_policy" target="_blank">Terms of Service</a> &middot;
+        <a href="{% url 'privacy' %}" target="_blank">Privacy</a>
+      </div>
+      <div class="col-md-4">
+        <p class="muted pull-right">A <a href="http://srct.gmu.edu/projects" target="_blank">project</a> of <a href="http://www.gmu.edu/" target="_blank">Mason</a> <a href="http://srct.gmu.edu/" target="_blank"><strong>SRCT</strong></a>. <a href="https://www.gnu.org/licenses/gpl-3.0.html"
+          target="_blank">Contribute</a> to <a href="http://git.gmu.edu/srct/roomlist/" target="_blank">our code</a>.</p>
      </div>
    </div>
  </div>
-</footer>
+</div>