diff options
| -rw-r--r-- | app/assets/stylesheets/matches.css.scss | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/tournaments.css.scss | 16 | ||||
| -rw-r--r-- | app/views/matches/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/tournaments/index.html.erb | 6 |
5 files changed, 33 insertions, 13 deletions
diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 84430d6..66da68e 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -39,4 +39,16 @@ #current-id { display: none; +} + + + +/**** INDEX PAGE - TABLE AND GRAPH ****/ +#matches-table { + @extend .table; + color: #FFF; + + form { + color: #333; + } }
\ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index fd2a1fb..40791e8 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -3,6 +3,7 @@ $page-color: #444; $toolbar-color: black; $orange: #DD9125; +$darker-orange: #9D4102; $link-yellow: #FFC50D; html{ @@ -22,6 +23,10 @@ h1, h2, h3, h4, h5, p{ color: $orange; } +h1, h2, h3, h4, h5 { + text-shadow: 0px 0px 2px $darker-orange; +} + p, ol, ul, td { font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; @@ -104,9 +109,10 @@ button, input[type="submit"] { footer { clear: both; margin: 0 auto; - margin-top: 10px; border-top: solid 1px $orange; padding-top: 10px; - color: white; text-align: center; + position:absolute; + bottom: 0; + width: 100%; }
\ No newline at end of file diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss index 2074783..41d6023 100644 --- a/app/assets/stylesheets/tournaments.css.scss +++ b/app/assets/stylesheets/tournaments.css.scss @@ -17,7 +17,7 @@ span.default-explanation { } #tournament-side-params { - background: none repeat scroll 0 0 #ADD8E6; + background: none repeat scroll 0 0 rgba(0,0,0,0.5); border-radius: 5px; float: right; font-size: 7px; @@ -33,23 +33,24 @@ span.default-explanation { #tournament-users{ li { - color: green; + color: #10A010; } .black { - color: black; + color: white; } } /* Style of a tournament listing div */ div.tournament-listing { - margin-top: 10px; + margin: 10px 0px; border-radius: 5px; - box-shadow: 2px 2px 4px #B8B8B8; - border: 2px solid #AAAAAA; + box-shadow: 0px 0px 3px #B8B8B8; + background-color: rgba(0, 0, 0, 0.6); + border: 1px solid #AAAAAA; min-height: 100px; - padding: 4px; + padding: 8px 4px; /* AKA the listing title */ h3 { @@ -65,6 +66,7 @@ div.tournament-listing { /* host of the tournament */ .host { font-weight: bold; + color: #FFF; } .col-md-8 { diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 08d5fd6..03427d8 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -1,7 +1,7 @@ <h1><%= @tournament.name %> - Matches</h1> -<table class="table"> +<table id="matches-table" class="table"> <thead> <tr> <th>Name</th> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 7957042..eef9577 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -5,8 +5,8 @@ <%# Each tournament has a div for its listing %> <% @tournaments.each do |t| %> <div class="row tournament-listing"> - <div class="col-md-2 "><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div> - <div class="col-md-8"> + <div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div> + <div class="col-md-8 col-sm-7 col-xs-6"> <%# "header" %> <%= link_to(t) do %><h3><%= t.name %></h3><% end %> <div class="row" style="margin-left:2%;"> @@ -23,7 +23,7 @@ </div> </div> </div> - <div class="col-md-2"> + <div class="col-md-2 col-sm-2 col-xs-2"> <% if signed_in? %> <% if !t.players.include?(current_user) %> <%= form_tag(tournament_path(t), method: "put") do %> |