5 files changed, 194 insertions, 5 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 3192ec8..dd7588a 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -11,3 +11,20 @@
  *= require_self
  *= require_tree .
  */
+
+#query{
+	background-color: white;
+	border: 2px solid #ED9C28;
+	border-radius: 5px;
+	color: #FFF;
+	font-weight: bold;
+	height: 30px;
+}
+.navbar{
+	background-color: white;
+}
+
+footer {
+	clear: both;
+	margin-top: 10px;
+}
+\ No newline at end of file
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
new file mode 100644
index 0000000..1a9b09a
--- /dev/null
+++ b/app/assets/stylesheets/custom.css.scss
@@ -0,0 +1,53 @@
+@import "bootstrap";
+
+header > nav {
+	@extend .navbar; 
+	@extend .navbar-inverse;
+	color: white;	
+
+	#log-buttons {
+		margin-top: 8px;
+		form { display: inline; }
+	}
+	form.search {
+		@extend .navbar-form;
+		@extend .navbar-right;
+		input[type="submit"] {
+			@extend .btn-warning; margin-top: -3px; margin-right: 8px;
+		}
+	}
+}
+
+a, input[type="submit"] {
+	@extend .btn;
+	&.user { @extend .btn-info; }
+	&.signup { @extend .btn-success; }
+	&.signin { @extend .btn-info; }
+	&.signout { @extend .btn-danger; }
+}
+
+p.errors {
+	background-color: #FCF8C7;
+	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;
+}
+\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 6ec6a8f..6700fef 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,3 +1,5 @@
+@import "bootstrap";
+
 body {
   background-color: #fff;
   color: #333;
@@ -6,6 +8,10 @@ body {
   line-height: 18px;
 }
 
+h1, h2, h3, h4, h5{
+  color: #0f0f0f;
+}
+
 p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
@@ -21,11 +27,11 @@ pre {
 a {
   color: #000;
   &:visited {
-    color: #666;
+    color: #000;
   }
   &:hover {
-    color: #fff;
-    background-color: #000;
+      color: green;
+      text-decoration: none;
   }
 }
 
@@ -40,8 +46,9 @@ div {
 }
 
 .field_with_errors {
-  padding: 2px;
-  background-color: red;
+  padding: 1px;
+  background-color: #FF4C4C;
+  box-shadow: 0px 0px 5px red;
   display: table;
 }
 
@@ -67,3 +74,26 @@ div {
     list-style: square;
   }
 }
+
+.navbar-brand {
+  @extend .no-dec;
+  a{
+    color: white;
+    &:hover, &:active, &:focus {
+      color: white;
+      font-weight: normal;
+      text-decoration: none;
+    }
+  }
+}
+
+footer {
+  text-align: center;
+  border-top: solid 1px #999999;
+  padding-top: 18px;
+  margin-top: 18px;
+}
+
+button, input[type="submit"] {
+    @extend .btn;
+}
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss
index 5a803c8..d73e77d 100644
--- a/app/assets/stylesheets/static.css.scss
+++ b/app/assets/stylesheets/static.css.scss
@@ -1,3 +1,12 @@
 // Place all the styles related to the static controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.jumbotron {
+	background-color: #FFF;
+
+	p {
+		line-height: 1.5em;
+	}
+
+}
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index e372b90..2074783 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -1,3 +1,83 @@
 // Place all the styles related to the tournaments controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+p.default-field {
+	display: inline;
+}
+
+span.default-explanation {
+	color: gray;
+	font-style: italic;  
+}
+
+#players-needed {
+	text-align: center;
+	font-style: italic;
+}
+
+#tournament-side-params {
+    background: none repeat scroll 0 0 #ADD8E6;
+    border-radius: 5px;
+    float: right;
+    font-size: 7px;
+    padding: 10px;
+
+    p {
+    	font-size: 10px;
+    	margin-bottom: 5px;
+    }
+
+}
+
+#tournament-users{
+	
+	li {
+		color: green;
+	}
+
+	.black {
+		color: black;
+	}
+}
+
+
+/* Style of a tournament listing div */
+div.tournament-listing {
+	margin-top: 10px;
+	border-radius: 5px;
+	box-shadow: 2px 2px 4px #B8B8B8;
+	border: 2px solid #AAAAAA;
+	min-height: 100px;
+	padding: 4px;
+
+	/* AKA the listing title */
+	h3 {
+		margin-top: 0px;
+		color: #F0AD4E;
+		font-weight: bold;
+	}
+
+	h3:hover {
+		color: #D09D3E;
+	}
+
+	/* host of the tournament */
+	.host {
+		font-weight: bold;
+	}
+
+	.col-md-8 {
+		padding: 0;
+		a {
+			padding: 5px 0 0 0;
+		}
+	}
+}
+
+div.leave-buttons {
+	margin-top: 50px;
+	form {
+		display: inline;
+	}
+}
+\ No newline at end of file