summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-10 12:09:48 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-10 12:09:48 +0000
commit867328848370abe67cea4d1604798dea20d0db4e (patch)
tree31e23610d55401907b80665bbed6212dadfebc01
parent68047fde6f768ab2be5b8e7f2f2453591d0a2e97 (diff)
downloadredmine-867328848370abe67cea4d1604798dea20d0db4e.tar.gz
redmine-867328848370abe67cea4d1604798dea20d0db4e.zip
Show assignee's icon in addition to author's icon (#25775).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@16655 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/issues/show.html.erb5
-rw-r--r--public/stylesheets/application.css12
2 files changed, 16 insertions, 1 deletions
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 26600559a..937ea8d40 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -25,7 +25,10 @@
</div>
<% end %>
- <%= avatar(@issue.author, :size => "50") %>
+ <div class="gravatar-with-child">
+ <%= avatar(@issue.author, :size => "50") %>
+ <%= avatar(@issue.assigned_to, :size => "22", :class => "gravatar gravatar-child") if @issue.assigned_to %>
+ </div>
<div class="subject">
<%= render_issue_subject_with_tree(@issue) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c1928d92b..bae9505a8 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1314,6 +1314,18 @@ div.issue img.gravatar {
margin: 0 6px 0 0;
}
+div.gravatar-with-child {
+ position: relative;
+}
+
+div.gravatar-with-child > img.gravatar:nth-child(2) {
+ position: absolute;
+ top: 30px;
+ left: 30px;
+ border-radius: 20%;
+ border: 2px solid rgba(255, 255, 255, 0.9);
+}
+
h2 img.gravatar {margin: -2px 4px -4px 0;}
h3 img.gravatar {margin: -4px 4px -4px 0;}
h4 img.gravatar {margin: -2px 4px -4px 0;}