From 271f890f06ac94a785f3223d0c44a7fa8b9d74f7 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Mon, 3 Mar 2014 21:24:45 -0500 Subject: Log out button --- app/assets/stylesheets/scaffolds.css.scss | 22 +--------------------- app/models/game.rb | 1 - app/views/games/index.html.erb | 4 ++-- app/views/layouts/application.html.erb | 5 +++++ 4 files changed, 8 insertions(+), 24 deletions(-) (limited to 'app') 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/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b36c0c5..e5032a4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,8 +14,13 @@ <%= link_to('Leaguer', '/', nil) %>
+ <% if signed_in? %> + + Log Out + <% end %> <%= form_tag("/search", method: "get", :class => "navbar-form navbar-right") do %> <%= text_field_tag(:query, nil, :placeholder => "Search") %> + <%= submit_tag("Go", {:class => "btn btn-warning"}) %> <% end %>
-- cgit v1.2.3-2-g168b
Name