From 25d8d625e79556e29f41d1d9982747716abf98e7 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Tue, 22 Apr 2014 00:02:35 -0400
Subject: new background texture. fixed inconsistency with login page

---
 app/views/sessions/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

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 %>
 
-- 
cgit v1.2.3-2-g168b


From d75fe3934366ea5e2581df6111c6bccdb77d1e95 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Tue, 22 Apr 2014 01:50:18 -0400
Subject: redesign of tournaments index and matches index

---
 app/views/matches/index.html.erb     | 2 +-
 app/views/tournaments/index.html.erb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/views')

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/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 %>
-- 
cgit v1.2.3-2-g168b


From 9531e27d6414ca1e3c9a81b1a98f0550d74fad1d Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 22 Apr 2014 02:06:20 -0400
Subject: migrated from stype to vartype because Luke changes my variable names
 without consulting me.

---
 app/views/tournaments/_selected.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

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>
-- 
cgit v1.2.3-2-g168b