Merge branch 'master' into wip/yeet

index.html

@@ -24,8 +24,8 @@
                     <ng-view></ng-view>
                 </div>
                 <ng-include src="'views/sidebar.html'"></ng-include>
-                <ng-include src="'views/footer.html'"></ng-include>
             </div>
+            <ng-include src="'views/footer.html'"></ng-include>
         </div>
     </body>
 </html>

styles/default.css

@@ -33,8 +33,9 @@ a
     position: relative;
 
     width: 800px;
-    min-height: calc(100vh - 120px);
-    margin-left: calc(50vw - 400px);
+    min-height: calc(100vh - 116px - 100px);
+    margin-right: auto;
+    margin-left: auto;
     padding-top: 100px;
 }
 
@@ -46,7 +47,7 @@ a
     z-index: 10;
     top: 0;
 
-    width: 100vw;
+    width: 100%;
     height: 70px;
 
     vertical-align: middle;
@@ -124,11 +125,20 @@ a
 
 .footerContainer
 {
-    position: absolute;
-    bottom: 0;
-
     width: 100%;
-    height: 100px;
+    height: 60px;
+}
+
+.centreFooterContainer
+{
+    width: calc(800px - 20px);
+    height: 100%;
+    margin-right: auto;
+    margin-left: auto;
+    padding: 10px;
+
+    color: #fff;
+    background-color: #000;
 }
 
 .sidebar

views/footer.html

@@ -1,3 +1,5 @@
 <div class="footerContainer">
-    Footer
+    <div class="centreFooterContainer">
+        Footer
+    </div>
 </div>