Merge branch 'master' of https://github.com/LukeShu/leaguer

1 files changed, 7 insertions, 6 deletions

diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 509cb19..e8fe9c5 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -19,7 +19,7 @@ body {
   height: 100%;
 }
 
-h1, h2, h3, h4, h5, p{
+h1, h2, h3, h4, h5, p, li{
   color: $orange;
 }
 
@@ -96,20 +96,21 @@ div {
 
 .wrapper {
 	width: 80%;
-	margin: 0 auto;
 	margin-top: 10px;
+  min-height: 80%;
+  height: auto !important;
+  height: 99%;
+  margin: 0 auto;
 }
 
 button, input[type="submit"] {
     @extend .btn;
 }
 
-
-
 footer {
   clear: both;
   border-top: solid 1px $orange;
-  padding-top: 10px;
   text-align: center;
-  bottom: 0;
+  margin: 0 auto;
+  width: 90%;
 }
\ No newline at end of file