diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 14:23:30 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 14:23:30 -0500 |
| commit | 2c1f214da8885232815cb85ded4ad616aa3d4b79 (patch) | |
| tree | 5a76f93a8b366b610309a50c1ddf80544e388709 | |
| parent | cd020cb3c9f8a1d40af4958c26dcdfb97e1a80c1 (diff) | |
| parent | 289caaa1c82db4895efaf01b33160712d169bc84 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/tournaments/new.html.erb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index d4c81a0..ab86ce9 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -20,7 +20,7 @@ header > nav { @extend .navbar-form; @extend .navbar-right; input[type="submit"] { - @extend .btn-warning; + @extend .btn-warning; margin-top: -3px; margin-right: 8px; } } } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7578d82..976ee85 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,7 +33,7 @@ <div class="container"><%= yield %></div> <footer> - <p>Leaguer is copyright © 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p> + <p>Leaguer © 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p> </footer> <%= debug(params) if Rails.env.development? %> </body> diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb index 428487a..3d6d142 100644 --- a/app/views/tournaments/new.html.erb +++ b/app/views/tournaments/new.html.erb @@ -2,7 +2,7 @@ <h1>New Tournament</h1> -<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> <%= link_to 'Select', 'new?game=1', :class => "btn btn-warning btn-lg" %> +<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> <%= link_to 'Select', 'new?game=1', :class => "btn btn-success btn-xs" %> @@ -14,6 +14,6 @@ </div> <br /><br /> -<%= link_to 'Select', 'selected', :class => "btn btn-warning btn-lg" %> +<%= link_to 'Select', 'selected', :class => "btn btn-success btn-xs" %> <%= link_to 'Back', tournaments_path %> |