summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/custom.css.scss2
-rw-r--r--app/views/layouts/application.html.erb2
-rw-r--r--app/views/tournaments/new.html.erb4
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 &copy; 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p>
+ <p>Leaguer &copy; 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 %>