new background texture. fixed inconsistency with login page

4 files changed, 31 insertions, 42 deletions

diff --git a/app/assets/images/bg.png b/app/assets/images/bg.png
new file mode 100644
index 0000000..91c77c8
--- /dev/null
+++ b/app/assets/images/bg.png
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 420bb4a..1931c0d 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -18,6 +18,7 @@ header > nav {
 	}
 }
 
+
 a, input[type="submit"] {
 	@extend .btn;
 	&.user { @extend .btn-info; }
@@ -25,6 +26,7 @@ a, input[type="submit"] {
 	&.signin { @extend .btn-warning; }
 	&.signout { @extend .btn-danger; }
 	&.server { @extend .btn-danger; }
+	font-weight: bold;
 }
 
 
@@ -39,32 +41,42 @@ input[type="text"],  input[type="password"]{
     box-shadow: 
       inset 0 0 8px  rgba(0,0,0,0.1),
             0 0 16px rgba(0,0,0,0.1); 
-    padding: 10px;
+    padding: 8px;
     background: rgba(0,0,0,0.5);
     margin: 0 0 5px 0;
 }
 
 p.errors {
-	background-color: #FCF8C7;
+	background-color: rgba(0,0,0,0.5);;
 	color: red;
 	border-radius: 7px;
 	padding: 10px;
 }
 
-#errorExplanation {
-	h2 {
-		font-size: 1em;
-		color: red;
-		font-weight: bold;
-	}
-	li {
-		font-size: 1em;
-		color: red;
-		font-style: italic;  
-	}
-
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px;
+    margin-bottom: 0px;
+    background-color: #c00;
+    color: #fff;
+  }
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
 }
 
+
 #notice {
 	text-align: center;
 	font-weight: bold;
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 36eec30..dd8c80e 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -10,7 +10,7 @@ html{
 }
 
 body {
-  background-color: $page-color;
+  background: asset-url("bg.png", image) repeat scroll 0 0 $page-color;
   color: $page-color;
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
@@ -70,6 +70,9 @@ div {
 
 #notice {
   color: green;
+  background-color: rgba(0,0,0,0.5);
+  border-radius: 7px;
+  padding: 10px;
 }
 
 .field_with_errors {
@@ -85,32 +88,6 @@ div {
 	margin-top: 10px;
 }
 
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0px;
-    background-color: #c00;
-    color: #fff;
-  }
-  ul li {
-    font-size: 12px;
-    list-style: square;
-  }
-}
-
-
-
-
 button, input[type="submit"] {
     @extend .btn;
 }
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index b4acf77..ff27762 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -14,7 +14,7 @@
       <%= f.password_field :password %>
     </p>
     <p>
-      <%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
+      <%= f.submit "Log in", class: "signin" %>
     </p>
     <% end %>