1 files changed, 22 insertions, 4 deletions
diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css
index 166b8c452..bf5e3e7d9 100644
--- a/module/web/static/css/default/style.css
+++ b/module/web/static/css/default/style.css
@@ -3,6 +3,14 @@
     General
  */
 
+* {
+    margin: 0;
+}
+
+html, body {
+    height: 100%;
+}
+
 body {
     margin: 0;
     padding: 0;
@@ -47,16 +55,24 @@ a {
 a:hover {
 }
 
-#wrapper {
-	width: 960px;
-    margin: 70px auto 0;
-    padding: 0;
+#wrap {
+    min-height: 100%;
+}
+
+#content {
+    margin-left: 150px;
+    margin-right: 150px;
+    padding-bottom: 100px; /* Height of footer */
 }
 
 /*
     Header
 */
 
+#push {
+    height: 70px; /* Pushes content down with height of header */
+}
+
 header {
     background: url("../../img/default/main-wrapper-bg.png") repeat-x;
     height: 70px;
@@ -101,9 +117,11 @@ header img.logo {
     Footer
 */
 
+
 footer {
     background: url("../../img/default/main-wrapper-bg.png") repeat-x;
     height: 100px;
+    margin-top: -100px;
     position: relative;
     width: 100%;
     z-index: 10;