From fb76b4db64583def6db3aac43e31c25d3bd489df Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Tue, 4 Mar 2014 16:22:22 -0500 Subject: Git is telling me to commit I dont know why --- app/assets/stylesheets/scaffolds.css.scss | 22 +--------------------- app/models/game.rb | 1 - app/views/games/index.html.erb | 4 ++-- db/migrate/20140220221228_create_servers.rb | 8 -------- db/migrate/20140220221236_create_matches.rb | 9 --------- db/migrate/20140228014045_create_games.rb | 13 ------------- 6 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 db/migrate/20140220221228_create_servers.rb delete mode 100644 db/migrate/20140220221236_create_matches.rb delete mode 100644 db/migrate/20140228014045_create_games.rb diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 8279f4f..6ec6a8f 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -1,13 +1,9 @@ body { - background-color: #EEEEEE; + background-color: #fff; color: #333; font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; - - h1, h2, h3, h4, h5{ - color: #0f0f0f; - } } p, ol, ul, td { @@ -71,19 +67,3 @@ div { list-style: square; } } - -hr { - -moz-border-bottom-colors: none; - -moz-border-image: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - border-color: #999 -moz-use-text-color #FFFFFF; - border-style: solid none; - border-width: 1px 0; - margin: 18px 0; -} - -#footer{ - text-align: center; -} diff --git a/app/models/game.rb b/app/models/game.rb index b3b6977..a181c26 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -1,3 +1,2 @@ class Game < ActiveRecord::Base - has_many :game_attributes end diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index 2c178f5..ccd0f63 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -1,6 +1,6 @@

Listing games

- +
@@ -32,4 +32,4 @@
-<%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %> +<%= link_to 'New Game', new_game_path %> diff --git a/db/migrate/20140220221228_create_servers.rb b/db/migrate/20140220221228_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140220221228_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140220221236_create_matches.rb b/db/migrate/20140220221236_create_matches.rb deleted file mode 100644 index 6c0c157..0000000 --- a/db/migrate/20140220221236_create_matches.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140228014045_create_games.rb b/db/migrate/20140228014045_create_games.rb deleted file mode 100644 index 59d4ef0..0000000 --- a/db/migrate/20140228014045_create_games.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :players_per_team - t.integer :teams_per_match - t.integer :set_rounds - t.integer :randomized_teams - - t.timestamps - end - end -end -- cgit v1.2.3-2-g168b From 489a9f7291b6b7c1143bb482f637020d82f944d5 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Tue, 4 Mar 2014 17:44:40 -0500 Subject: Buttons fixed --- app/assets/stylesheets/custom.css.scss | 21 +++++++++++++++++---- app/assets/stylesheets/scaffolds.css.scss | 4 ++-- app/views/layouts/application.html.erb | 7 ++++--- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index a8a8e68..faecdce 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -4,7 +4,20 @@ header > nav { @extend .navbar; @extend .navbar-inverse; color: white; -} -header > nav > #log-buttons{ - margin-top: 8px; -} + + #log-buttons { + margin-top: 8px; + } + .signup { + @extend .btn; + @extend .btn-success; + } + .signin { + @extend .btn; + @extend .btn-info; + } + .signout { + @extend .btn; + @extend .btn-danger; + } + } \ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 39b6845..252cb2b 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: #666; + color: white; } &:hover { - color: #000; + color: white; text-decoration: none; } } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6fdbbec..093f31a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,10 +20,11 @@
<% if signed_in? %> <%= current_user.user_name.upcase %> - + <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout", :role => "button" %> <% else %> - - + <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %> + <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button" + %> <% end %>
-- cgit v1.2.3-2-g168b From 6d48e4641520ce03796e5b9edd258f704cee3e82 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Tue, 4 Mar 2014 17:46:05 -0500 Subject: Changed some username validation stuff --- app/assets/stylesheets/scaffolds.css.scss | 7 ------- app/models/user.rb | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 566d05d..f705417 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -4,13 +4,10 @@ body { font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; -<<<<<<< HEAD -======= } h1, h2, h3, h4, h5{ color: #0f0f0f; ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b } p, ol, ul, td { @@ -74,9 +71,6 @@ div { list-style: square; } } -<<<<<<< HEAD -======= - hr { -moz-border-bottom-colors: none; -moz-border-image: none; @@ -102,4 +96,3 @@ hr { #footer{ text-align: center; } ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b diff --git a/app/models/user.rb b/app/models/user.rb index 55ea60f..db65dc4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,7 +1,7 @@ class User < ActiveRecord::Base before_save { self.email = email.downcase } - before_save { self.user_name = user_name.downcase } + before_save { self.user_name = user_name } ## # Rails looks for the create_remember_token and runs the method -- cgit v1.2.3-2-g168b From bc42a479891d491aecd5477cfeedd986e9738438 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Tue, 4 Mar 2014 17:55:49 -0500 Subject: sign out link edited --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 093f31a..e13a8df 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,7 +20,7 @@
<% if signed_in? %> <%= current_user.user_name.upcase %> - <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout", :role => "button" %> + <%= link_to "Sign out", session_path("/signout"), method: "delete", :class => "signout", :role => "button" %> <% else %> <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %> <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button" -- cgit v1.2.3-2-g168b
Name