Merge branch 'master2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/tournament.rb
	app/views/tournaments/_selected.html.erb
	app/views/tournaments/new.html.erb
	config/routes.rb

1 files changed, 10 insertions, 9 deletions

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index d4c81a0..4ea86d4 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -7,24 +7,25 @@ header > nav {
 
 	#log-buttons {
 		margin-top: 8px;
-	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; }
-		}
+		form { display: inline; }
 	}
 	form.search {
 		@extend .navbar-form;
 		@extend .navbar-right;
 		input[type="submit"] {
-			@extend .btn-warning;
+			@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;