kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

linkify the whole user badge part, not only avatar

This commit is contained in:
Alexis Reigel 2017-06-24 21:24:49 +02:00
parent ee7468e786
commit 7fc69a7ed4
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/pages/commits.scss
View File

@ -314,6 +314,11 @@
}
}
.gpg-badge-popover-user-link {
text-decoration: none;
color: $gl-text-color;
}
.gpg-badge-popover-avatar {
float: left;
margin-bottom: $gl-padding;

32
app/helpers/commits_helper.rb
View File

@ -228,23 +228,25 @@ module CommitsHelper
end
content = capture do
concat(
content_tag(:div, class: 'gpg-badge-popover-avatar') do
user_avatar(user: signature.gpg_key.user, size: 32)
end
)
link_to user_path(signature.gpg_key.user), class: 'gpg-badge-popover-user-link' do
concat(
content_tag(:div, class: 'gpg-badge-popover-avatar') do
user_avatar_without_link(user: signature.gpg_key.user, size: 32)
end
)
concat(
content_tag(:div, class: 'gpg-badge-popover-username') do
signature.gpg_key.user.username
end
)
concat(
content_tag(:div, class: 'gpg-badge-popover-username') do
signature.gpg_key.user.username
end
)
concat(
content_tag(:div) do
signature.gpg_key.user.name
end
)
concat(
content_tag(:div) do
signature.gpg_key.user.name
end
)
end
end
commit_gpg_signature_badge_with(signature, label: 'Verified', title: title, content: content, css_classes: ['valid'])