summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornfoy <nfoy@purdue.edu>2014-04-03 16:50:52 -0400
committernfoy <nfoy@purdue.edu>2014-04-03 16:50:52 -0400
commite7b805cd2c7f934f47663c04cf0a98be58e26130 (patch)
treebbbf23fc334f3ff9a5673a4dfe78af56fa1223ea
parentef0cc1035632d7b59a5977038ac30fe1292d0128 (diff)
parent25cfa69883a5c74b2a6e6a5021c53fd95202c234 (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
-rw-r--r--app/assets/stylesheets/application.css5
-rw-r--r--app/views/tournaments/show.html.erb29
2 files changed, 5 insertions, 29 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index b3f5d46..dd7588a 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -23,3 +23,8 @@
.navbar{
background-color: white;
}
+
+footer {
+ clear: both;
+ margin-top: 10px;
+} \ No newline at end of file
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index d246f7a..9939d02 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -40,35 +40,6 @@
<%= @tournament.max_teams_per_match %>
</p>
-<p>
- <strong>Set rounds:</strong>
- <%= @tournament.set_rounds %>
-</p>
-
-<p>
- <strong>Min players per team:</strong>
- <%= @tournament.min_players_per_team %>
-</p>
-
-<p>
- <strong>Max players per team:</strong>
- <%= @tournament.max_players_per_team %>
-</p>
-
-<p>
- <strong>Min teams per match:</strong>
- <%= @tournament.min_teams_per_match %>
-</p>
-
-<p>
- <strong>Max teams per match:</strong>
- <%= @tournament.max_teams_per_match %>
-</p>
-
-<p>
- <strong>Set rounds:</strong>
- <%= @tournament.set_rounds %>
-</p>
<p>
<strong>Randomized teams:</strong>