From 40fc1b036d35ef641c0175d8bffa58a4ed86c563 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sun, 27 Apr 2014 02:59:45 +0100 Subject: [PATCH] Further styling tweaks to users/profile/maps --- app/assets/stylesheets/pages/_users.scss | 7 +++++ app/views/maps/index.html.erb | 4 +-- app/views/matches/_list.html.erb | 2 +- app/views/users/_predictions.html.erb | 34 +++++++++++------------- app/views/users/_teams.html.erb | 12 ++++----- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/app/assets/stylesheets/pages/_users.scss b/app/assets/stylesheets/pages/_users.scss index 3c2d519..7228b8d 100644 --- a/app/assets/stylesheets/pages/_users.scss +++ b/app/assets/stylesheets/pages/_users.scss @@ -98,6 +98,13 @@ } } } + + table.predictions { + + .prediction { + text-align: right; + } + } } #profile-edit { diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb index f515749..408a8e2 100644 --- a/app/views/maps/index.html.erb +++ b/app/views/maps/index.html.erb @@ -4,14 +4,14 @@ Name Download - Options + <% @maps.each do |map| %> <%= namelink map %> <%= h map.download %> - + <%= link_to icon('pencil'), edit_map_path(map) %> <%= link_to icon('times'), map, confirm: 'Are you sure?', method: :delete %> diff --git a/app/views/matches/_list.html.erb b/app/views/matches/_list.html.erb index 109bdd1..d5b48eb 100644 --- a/app/views/matches/_list.html.erb +++ b/app/views/matches/_list.html.erb @@ -1,4 +1,4 @@ - +
<% if contest %> diff --git a/app/views/users/_predictions.html.erb b/app/views/users/_predictions.html.erb index 800260e..63c1c38 100644 --- a/app/views/users/_predictions.html.erb +++ b/app/views/users/_predictions.html.erb @@ -1,22 +1,18 @@ -

- Predictions -

+

Predictions

-
-
Contest
+
+ + + + + + <% @user.predictions.with_contest.each do |prediction| %> - - - + + + - <% @user.predictions.with_contest.each do |prediction| %> - - - - - - <% end %> -
ContestMatchPredicted
ContestMatchPredicted<%= namelink prediction.match.contest %><%= namelink prediction.match, 30 %> + <%= prediction.score1 %> - <%= prediction.score2 %> +
<%= namelink prediction.match.contest %><%= namelink prediction.match, 30 %> - <%= prediction.score1 %> - <%= prediction.score2 %> -
- + <% end %> + diff --git a/app/views/users/_teams.html.erb b/app/views/users/_teams.html.erb index df5ee7a..6055a75 100644 --- a/app/views/users/_teams.html.erb +++ b/app/views/users/_teams.html.erb @@ -1,11 +1,9 @@ -

- Team History -

+

Team History

- +
- - + + <% @user.teamers.past.each do |teamer| %> @@ -15,7 +13,7 @@ - <%= longdate teamer.updated_at %> -
Date Joined - Date LeftTeamDate Joined - Date LeftTeam
+ <%= namelink teamer.team %>