diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 18:27:34 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 18:27:34 -0400 |
| commit | f12a66473c024cad3b1947e148d2df230884c468 (patch) | |
| tree | 45333387accbcc7fef9e66e078ce943b737b1ae3 | |
| parent | b7cbf3df615575fe1d24a9ea1ddfded094ae529f (diff) | |
| parent | a185e81094bed6626ac69449eff0f01bdfbc5197 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/assets/stylesheets/application.css | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 13 | ||||
| -rw-r--r-- | app/assets/stylesheets/static.css.scss | 3 | ||||
| -rw-r--r-- | app/views/search/go.html.erb | 5 |
4 files changed, 12 insertions, 16 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index ebb963c..677791c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -22,10 +22,3 @@ padding: 0px 5px; } -footer { - clear: both; - margin: 0 auto; - margin-top: 10px; - color: white; - width: 90%; -}
\ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 509cb19..e8fe9c5 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -19,7 +19,7 @@ body { height: 100%; } -h1, h2, h3, h4, h5, p{ +h1, h2, h3, h4, h5, p, li{ color: $orange; } @@ -96,20 +96,21 @@ div { .wrapper { width: 80%; - margin: 0 auto; margin-top: 10px; + min-height: 80%; + height: auto !important; + height: 99%; + margin: 0 auto; } button, input[type="submit"] { @extend .btn; } - - footer { clear: both; border-top: solid 1px $orange; - padding-top: 10px; text-align: center; - bottom: 0; + margin: 0 auto; + width: 90%; }
\ No newline at end of file diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss index 14443f3..6732370 100644 --- a/app/assets/stylesheets/static.css.scss +++ b/app/assets/stylesheets/static.css.scss @@ -5,7 +5,8 @@ .jumbotron { background-color: #FFF; box-shadow: 1px 1px 20px black; - + width: 93%; + p { line-height: 1.5em; } diff --git a/app/views/search/go.html.erb b/app/views/search/go.html.erb index 6d5826f..324fa48 100644 --- a/app/views/search/go.html.erb +++ b/app/views/search/go.html.erb @@ -1,10 +1,11 @@ <%# Show search results if a query was not nill %> <% if !@query.empty? %> - <h3> Showing results for: <span><%= @query %></span></h3> + <% if @tournaments.empty? and @players.empty? %> - <p> No results found for "<%= @query %>" </p> + <h3> No results found for "<%= @query %>" </h3> <% else %> + <h3> Showing results for: <span><%= @query %></span></h3> <% if @tournaments.length > 0 %> <h4> Tournaments </h4> <% end %> |