temp new layouts

3 files changed, 61 insertions, 10 deletions

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index dd7588a..ab45dd0 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -26,5 +26,8 @@
 
 footer {
 	clear: both;
+	margin: 0 auto;
 	margin-top: 10px;
+	color: white;
+	width: 90%;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 6700fef..02b96a2 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,15 +1,56 @@
 @import "bootstrap";
 
+$page-color: #444;
+$toolbar-color: black;
+
+html{
+  height: 100%;
+}
+
 body {
-  background-color: #fff;
-  color: #333;
+  background-color: $page-color;
+  color: $page-color;
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
   line-height: 18px;
+  height: 100%;
+}
+
+.wrapper {
+  padding-left: 5%;
+  padding-right: 5%;
+  margin: 0 auto;
+  background-color: #fff;
+  padding-top: 10px;
+  height: 90%;
+  box-shadow: 1px 1px 7px orange;
+  border-radius: 0px 0px 5px 5px;
+}
+
+footer {
+  clear: both;
+  margin: 0 auto;
+  margin-top: 10px;
+  color: white;
+
+}
+
+@media screen and (min-width: 480px) {
+  .wrapper, footer {
+    width: 80%;
+    min-width: 480px;
+    max-width: 1024px;
+  }
+}
+
+@media screen and (max-width: 480px) {
+  .wrapper, footer {
+    width: 100%;
+  }
 }
 
 h1, h2, h3, h4, h5{
-  color: #0f0f0f;
+  color: #030303;
 }
 
 p, ol, ul, td {
@@ -75,6 +116,9 @@ div {
   }
 }
 
+
+/* NAVBAR */
+
 .navbar-brand {
   @extend .no-dec;
   a{
@@ -87,11 +131,12 @@ div {
   }
 }
 
-footer {
-  text-align: center;
-  border-top: solid 1px #999999;
-  padding-top: 18px;
-  margin-top: 18px;
+.navbar-inverse, header > nav {
+    background-color: $toolbar-color;
+    border-color: #0F4070;
+    border-radius: 0px 0px 5px 5px;
+    margin-bottom: 0px;
+
 }
 
 button, input[type="submit"] {
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index de9f3b8..e6b5b25 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -38,11 +38,14 @@
 
 <% if notice %><div id="notice"><p><%= notice %></p></div><% end %>
 
-<div class="container"><%= yield %></div>
+<div class="wrapper">
+		<%= yield %>
+</div>
 
 <footer>
 	<p>Leaguer &copy; 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p>
+	<%= debug(params) if Rails.env.development? %>
 </footer>
-<%= debug(params) if Rails.env.development? %>
+
 </body>
 </html>