diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:49:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:49:34 -0400 |
| commit | 474a048ae4a4fae86e7fde93745f0ea79c7ed717 (patch) | |
| tree | 63e87b93634d90c8236b09a02c19e37031d55304 /app/views | |
| parent | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (diff) | |
| parent | 9531e27d6414ca1e3c9a81b1a98f0550d74fad1d (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/models/match.rb
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/matches/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/sessions/new.html.erb | 2 | ||||
| -rw-r--r-- | app/views/tournaments/_selected.html.erb | 2 | ||||
| -rw-r--r-- | app/views/tournaments/index.html.erb | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 08d5fd6..03427d8 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -1,7 +1,7 @@ <h1><%= @tournament.name %> - Matches</h1> -<table class="table"> +<table id="matches-table" class="table"> <thead> <tr> <th>Name</th> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index b4acf77..ff27762 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -14,7 +14,7 @@ <%= f.password_field :password %> </p> <p> - <%= f.submit "Sign in", class: "btn btn-large btn-primary" %> + <%= f.submit "Log in", class: "signin" %> </p> <% end %> diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb index 2ab8379..eec8b5e 100644 --- a/app/views/tournaments/_selected.html.erb +++ b/app/views/tournaments/_selected.html.erb @@ -18,7 +18,7 @@ <% end %> <%= fields_for "tournament[settings]", @tournament.settings do |setting_fields| %> - <% @game.settings.each do |setting| %> + <% @tournament.settings.each do |setting| %> <p> <%= setting_fields.label setting.name %> <br> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 7957042..eef9577 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -5,8 +5,8 @@ <%# Each tournament has a div for its listing %> <% @tournaments.each do |t| %> <div class="row tournament-listing"> - <div class="col-md-2 "><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div> - <div class="col-md-8"> + <div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div> + <div class="col-md-8 col-sm-7 col-xs-6"> <%# "header" %> <%= link_to(t) do %><h3><%= t.name %></h3><% end %> <div class="row" style="margin-left:2%;"> @@ -23,7 +23,7 @@ </div> </div> </div> - <div class="col-md-2"> + <div class="col-md-2 col-sm-2 col-xs-2"> <% if signed_in? %> <% if !t.players.include?(current_user) %> <%= form_tag(tournament_path(t), method: "put") do %> |