Merge branch 'master' of https://github.com/LukeShu/leaguer

4 files changed, 32 insertions, 1 deletions

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index d299dda..4104235 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -1,5 +1,11 @@
 @import "bootstrap";
 
+$page-color: #444;
+$toolbar-color: black;
+$orange: #DD9125;
+$darker-orange: #9D4102;
+$link-yellow: #FFC50D;
+
 header > nav {
 	@extend .navbar; 
 	@extend .navbar-inverse;
@@ -41,6 +47,13 @@ input[type="text"],  input[type="password"]{
 	margin: 0 0 5px 0;
 }
 
+select {
+	background-color: #333;
+	padding: 5px;
+	border: none;
+	color: #DD9125 !important;
+}
+
 p.errors {
 	background-color: rgba(0,0,0,0.5);;
 	color: red;
diff --git a/app/assets/stylesheets/pms.css.scss b/app/assets/stylesheets/pms.css.scss
index 5106093..a14299e 100644
--- a/app/assets/stylesheets/pms.css.scss
+++ b/app/assets/stylesheets/pms.css.scss
@@ -1,3 +1,11 @@
 // Place all the styles related to the pms controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+p, li {
+    color: #DD9125;
+}
+td, th {
+    padding: 0px;
+    color: #DD9125;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index e8fe9c5..eb1f751 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -19,7 +19,7 @@ body {
   height: 100%;
 }
 
-h1, h2, h3, h4, h5, p, li{
+h1, h2, h3, h4, h5, p, li, label{
   color: $orange;
 }
 
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index 41d6023..cc55253 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -75,6 +75,16 @@ div.tournament-listing {
 			padding: 5px 0 0 0;
 		}
 	}
+
+	.t-game{
+		font-weight: bold;
+		text-align: center;
+	}
+
+	.t-image{
+		display: block;
+    	margin:auto;
+	}
 }
 
 div.leave-buttons {