prelim style 2.0

4 files changed, 64 insertions, 64 deletions

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index ab45dd0..ebb963c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,15 +13,13 @@
  */
 
 #query{
-	background-color: white;
+	background-color: #303030;
 	border: 2px solid #ED9C28;
 	border-radius: 5px;
 	color: #FFF;
 	font-weight: bold;
 	height: 30px;
-}
-.navbar{
-	background-color: white;
+	padding: 0px 5px;
 }
 
 footer {
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index febcbb8..420bb4a 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -22,11 +22,28 @@ a, input[type="submit"] {
 	@extend .btn;
 	&.user { @extend .btn-info; }
 	&.signup { @extend .btn-success; }
-	&.signin { @extend .btn-info; }
+	&.signin { @extend .btn-warning; }
 	&.signout { @extend .btn-danger; }
 	&.server { @extend .btn-danger; }
 }
 
+
+input[type="text"],  input[type="password"]{
+	border: 3px inset #A5A5A5;
+    -webkit-box-shadow: 
+      inset 0 0 8px  rgba(0,0,0,0.1),
+            0 0 16px rgba(0,0,0,0.1); 
+    -moz-box-shadow: 
+      inset 0 0 8px  rgba(0,0,0,0.1),
+            0 0 16px rgba(0,0,0,0.1); 
+    box-shadow: 
+      inset 0 0 8px  rgba(0,0,0,0.1),
+            0 0 16px rgba(0,0,0,0.1); 
+    padding: 10px;
+    background: rgba(0,0,0,0.5);
+    margin: 0 0 5px 0;
+}
+
 p.errors {
 	background-color: #FCF8C7;
 	color: red;
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 02b96a2..36eec30 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -2,6 +2,8 @@
 
 $page-color: #444;
 $toolbar-color: black;
+$orange: #DD9125;
+$link-yellow: #FFC50D;
 
 html{
   height: 100%;
@@ -16,47 +18,34 @@ body {
   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;
+h1, h2, h3, h4, h5, p{
+  color: $orange;
 }
 
-footer {
-  clear: both;
-  margin: 0 auto;
-  margin-top: 10px;
-  color: white;
-
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
 }
 
-@media screen and (min-width: 480px) {
-  .wrapper, footer {
-    width: 80%;
-    min-width: 480px;
-    max-width: 1024px;
-  }
-}
+/* NAVBAR */
 
-@media screen and (max-width: 480px) {
-  .wrapper, footer {
-    width: 100%;
+.navbar-brand {
+  @extend .no-dec;
+  a{
+    color: white;
+    &:hover, &:active, &:focus {
+      color: white;
+      font-weight: normal;
+      text-decoration: none;
+    }
   }
 }
 
-h1, h2, h3, h4, h5{
-  color: #030303;
-}
-
-p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
+.navbar-inverse, header > nav {
+    background-color: $toolbar-color;
+    border-radius: 0px 0px 5px 5px;
+    box-shadow: 0px 0px 5px black;
 }
 
 pre {
@@ -66,12 +55,9 @@ pre {
 }
 
 a {
-  color: #000;
-  &:visited {
-    color: #000;
-  }
-  &:hover {
-      color: green;
+	color: $link-yellow;
+  	&:hover {
+      color: #FFEF00;
       text-decoration: none;
   }
 }
@@ -93,6 +79,12 @@ div {
   display: table;
 }
 
+.wrapper {
+	width: 80%;
+	margin: 0 auto;
+	margin-top: 10px;
+}
+
 #error_explanation {
   width: 450px;
   border: 2px solid red;
@@ -117,28 +109,20 @@ div {
 }
 
 
-/* NAVBAR */
 
-.navbar-brand {
-  @extend .no-dec;
-  a{
-    color: white;
-    &:hover, &:active, &:focus {
-      color: white;
-      font-weight: normal;
-      text-decoration: none;
-    }
-  }
-}
-
-.navbar-inverse, header > nav {
-    background-color: $toolbar-color;
-    border-color: #0F4070;
-    border-radius: 0px 0px 5px 5px;
-    margin-bottom: 0px;
-
-}
 
 button, input[type="submit"] {
     @extend .btn;
 }
+
+
+
+footer {
+  clear: both;
+  margin: 0 auto;
+  margin-top: 10px;
+  border-top: solid 1px $orange;
+  padding-top: 10px;
+  color: white;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss
index d73e77d..14443f3 100644
--- a/app/assets/stylesheets/static.css.scss
+++ b/app/assets/stylesheets/static.css.scss
@@ -4,6 +4,7 @@
 
 .jumbotron {
 	background-color: #FFF;
+	box-shadow: 1px 1px 20px black;
 
 	p {
 		line-height: 1.5em;