Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/match.rb

8 files changed, 130 insertions, 113 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/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..d7f1698 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -18,37 +18,60 @@ header > nav {
 	}
 }
 
+
 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; }
+	font-weight: bold !important;
+}
+
+
+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: 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;  
-	}
-
-}
-
-#notice {
-	text-align: center;
-	font-weight: bold;
+#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;
+  }
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss
index 84430d6..66da68e 100644
--- a/app/assets/stylesheets/matches.css.scss
+++ b/app/assets/stylesheets/matches.css.scss
@@ -39,4 +39,16 @@
 
 #current-id {
     display: none;
+}
+
+
+
+/**** INDEX PAGE - TABLE AND GRAPH ****/
+#matches-table {
+    @extend .table;
+    color: #FFF;
+
+    form {
+        color: #333;
+    }
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 02b96a2..40791e8 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -2,13 +2,16 @@
 
 $page-color: #444;
 $toolbar-color: black;
+$orange: #DD9125;
+$darker-orange: #9D4102;
+$link-yellow: #FFC50D;
 
 html{
   height: 100%;
 }
 
 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;
@@ -16,47 +19,38 @@ 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;
-
+h1, h2, h3, h4, h5 {
+  text-shadow: 0px 0px 2px $darker-orange;
 }
 
-@media screen and (min-width: 480px) {
-  .wrapper, footer {
-    width: 80%;
-    min-width: 480px;
-    max-width: 1024px;
-  }
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
 }
 
-@media screen and (max-width: 480px) {
-  .wrapper, footer {
-    width: 100%;
-  }
-}
+/* NAVBAR */
 
-h1, h2, h3, h4, h5{
-  color: #030303;
+.navbar-brand {
+  @extend .no-dec;
+  a{
+    color: white;
+    &:hover, &:active, &:focus {
+      color: white;
+      font-weight: normal;
+      text-decoration: none;
+    }
+  }
 }
 
-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 +60,9 @@ pre {
 }
 
 a {
-  color: #000;
-  &:visited {
-    color: #000;
-  }
-  &:hover {
-      color: green;
+	color: $link-yellow;
+  	&:hover {
+      color: #FFEF00;
       text-decoration: none;
   }
 }
@@ -83,7 +74,17 @@ div {
 }
 
 #notice {
-  color: green;
+  background-color: rgba(0,0,0,0.5);
+  border-radius: 7px;
+  padding: 10px;
+  width: 80%;
+  margin: 0px auto;
+  text-align: center;
+
+  p{
+    color: lightgreen !important;
+    font-weight: bold;
+  }
 }
 
 .field_with_errors {
@@ -93,52 +94,25 @@ div {
   display: table;
 }
 
-#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;
-  }
+.wrapper {
+	width: 80%;
+	margin: 0 auto;
+	margin-top: 10px;
 }
 
-
-/* NAVBAR */
-
-.navbar-brand {
-  @extend .no-dec;
-  a{
-    color: white;
-    &:hover, &:active, &:focus {
-      color: white;
-      font-weight: normal;
-      text-decoration: none;
-    }
-  }
+button, input[type="submit"] {
+    @extend .btn;
 }
 
-.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;
+  border-top: solid 1px $orange;
+  padding-top: 10px;
+  text-align: center;
+  position:absolute;
+  bottom: 0;
+  width: 100%;
+}
\ 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;
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index 2074783..41d6023 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -17,7 +17,7 @@ span.default-explanation {
 }
 
 #tournament-side-params {
-    background: none repeat scroll 0 0 #ADD8E6;
+    background: none repeat scroll 0 0 rgba(0,0,0,0.5);
     border-radius: 5px;
     float: right;
     font-size: 7px;
@@ -33,23 +33,24 @@ span.default-explanation {
 #tournament-users{
 	
 	li {
-		color: green;
+		color: #10A010;
 	}
 
 	.black {
-		color: black;
+		color: white;
 	}
 }
 
 
 /* Style of a tournament listing div */
 div.tournament-listing {
-	margin-top: 10px;
+	margin: 10px 0px;
 	border-radius: 5px;
-	box-shadow: 2px 2px 4px #B8B8B8;
-	border: 2px solid #AAAAAA;
+	box-shadow: 0px 0px 3px #B8B8B8;
+	background-color: rgba(0, 0, 0, 0.6);
+	border: 1px solid #AAAAAA;
 	min-height: 100px;
-	padding: 4px;
+	padding: 8px 4px;
 
 	/* AKA the listing title */
 	h3 {
@@ -65,6 +66,7 @@ div.tournament-listing {
 	/* host of the tournament */
 	.host {
 		font-weight: bold;
+		color: #FFF;
 	}
 
 	.col-md-8 {
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
index 1efc835..3453a55 100644
--- a/app/assets/stylesheets/users.css.scss
+++ b/app/assets/stylesheets/users.css.scss
@@ -1,3 +1,10 @@
 // Place all the styles related to the users controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+
+/*** FOR NEW USER - AKA SIGN UP ***/
+.simple_captcha {
+	background-color: rgba(255, 255, 255, 0.7);
+	margin: 10px 0px;
+}
\ No newline at end of file