mergin' the wizard

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

4 files changed, 20 insertions, 24 deletions

diff --git a/app/assets/images/.keep b/app/assets/images/.keep
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/images/.keep
+++ /dev/null
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
deleted file mode 100644
index d6925fa..0000000
--- a/app/assets/javascripts/application.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require jquery_ujs
-//= require turbolinks
-//= require_tree .
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index a8a8e68..faecdce 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -4,7 +4,20 @@ header > nav {
 	@extend .navbar; 
 	@extend .navbar-inverse;
 	color: white;	
-}
-header > nav > #log-buttons{
-	margin-top: 8px;
-}
+
+	#log-buttons {
+		margin-top: 8px;
+	}
+		.signup {
+			@extend .btn;
+			@extend .btn-success;
+		}
+		.signin {
+			@extend .btn;
+			@extend .btn-info;
+		}
+		.signout {
+			@extend .btn;
+			@extend .btn-danger;
+		}
+	}
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 39b6845..2c8c009 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,5 +1,5 @@
 body {
-  background-color: #EEEEEE;
+  background-color: #fff;
   color: #333;
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
@@ -25,10 +25,10 @@ pre {
 a {
   color: #000;
   &:visited {
-    color: #666;
+    color: white;
   }
   &:hover {
-      color: #000;
+      color: white;
       text-decoration: none;
   }
 }
@@ -71,7 +71,6 @@ div {
     list-style: square;
   }
 }
-
 hr {
   -moz-border-bottom-colors: none;
   -moz-border-image: none;