Commit d5bb466fe4aa44b5c303d7ba55f48af752e164da
1 parent
55024ed1
Exists in
spb-stable
and in
3 other branches
Fix for #5767
In the branch graph, uploaded images where not rendered correctly. Fixed this by not filling the rect, instead i've put an image over it
Showing
1 changed file
with
5 additions
and
2 deletions
Show diff stats
app/assets/javascripts/branch-graph.js.coffee
| @@ -194,11 +194,14 @@ class BranchGraph | @@ -194,11 +194,14 @@ class BranchGraph | ||
| 194 | fill: @colors[commit.space] | 194 | fill: @colors[commit.space] |
| 195 | stroke: "none" | 195 | stroke: "none" |
| 196 | ) | 196 | ) |
| 197 | - r.rect(@offsetX + @unitSpace * @mspace + 10, y - 10, 20, 20).attr( | ||
| 198 | - fill: "url(#{commit.author.icon})" | 197 | + |
| 198 | + avatar_box_x = @offsetX + @unitSpace * @mspace + 10 | ||
| 199 | + avatar_box_y = y - 10 | ||
| 200 | + r.rect(avatar_box_x, avatar_box_y, 20, 20).attr( | ||
| 199 | stroke: @colors[commit.space] | 201 | stroke: @colors[commit.space] |
| 200 | "stroke-width": 2 | 202 | "stroke-width": 2 |
| 201 | ) | 203 | ) |
| 204 | + r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20) | ||
| 202 | r.text(@offsetX + @unitSpace * @mspace + 35, y, commit.message.split("\n")[0]).attr( | 205 | r.text(@offsetX + @unitSpace * @mspace + 35, y, commit.message.split("\n")[0]).attr( |
| 203 | "text-anchor": "start" | 206 | "text-anchor": "start" |
| 204 | font: "14px Monaco, monospace" | 207 | font: "14px Monaco, monospace" |