I REALLY hope I'm not overwriting anything

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

Conflicts:
	app/assets/stylesheets/custom.css.scss

4 files changed, 36 insertions, 3 deletions

diff --git a/app/assets/javascripts/ajax.js b/app/assets/javascripts/ajax.js
index 31578dd..040c100 100644
--- a/app/assets/javascripts/ajax.js
+++ b/app/assets/javascripts/ajax.js
@@ -12,4 +12,8 @@ function populate() {
 			;
 		}
 	};
-}
\ No newline at end of file
+
+//$.ajax(url: "/selected").done (html) ->  $("#ajax-form").append html
+
+}
+
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 0000000..d6925fa
--- /dev/null
+++ b/app/assets/javascripts/application.js
@@ -0,0 +1,16 @@
+// 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 906780e..489914b 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -7,6 +7,7 @@ header > nav {
 
 	#log-buttons {
 		margin-top: 8px;
+<<<<<<< HEAD
 	}
 	.signup {
 		@extend .btn;
@@ -43,3 +44,15 @@ p.errors {
 
 }
 
+=======
+		form { display: inline; }
+		a, input[type="submit"] {
+			@extend .btn;
+			&.user { @extend .btn-info; }
+			&.signup { @extend .btn-success; }
+			&.signin { @extend .btn-info; }
+			&.signout { @extend .btn-danger; }
+		}
+	}
+}
+>>>>>>> 6db29eb669a85e5b0aac7a1e8879781a1cb77772
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 9400133..07c7676 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -25,10 +25,10 @@ pre {
 a {
   color: #000;
   &:visited {
-    color: white;
+    color: #000;
   }
   &:hover {
-      color: white;
+      color: green;
       text-decoration: none;
   }
 }