Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
7fc69a7e
Commit
7fc69a7e
authored
Jun 24, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linkify the whole user badge part, not only avatar
parent
ee7468e7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
17 deletions
+24
-17
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+5
-0
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+19
-17
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
7fc69a7e
...
@@ -314,6 +314,11 @@
...
@@ -314,6 +314,11 @@
}
}
}
}
.gpg-badge-popover-user-link
{
text-decoration
:
none
;
color
:
$gl-text-color
;
}
.gpg-badge-popover-avatar
{
.gpg-badge-popover-avatar
{
float
:
left
;
float
:
left
;
margin-bottom
:
$gl-padding
;
margin-bottom
:
$gl-padding
;
...
...
app/helpers/commits_helper.rb
View file @
7fc69a7e
...
@@ -228,9 +228,10 @@ module CommitsHelper
...
@@ -228,9 +228,10 @@ module CommitsHelper
end
end
content
=
capture
do
content
=
capture
do
link_to
user_path
(
signature
.
gpg_key
.
user
),
class:
'gpg-badge-popover-user-link'
do
concat
(
concat
(
content_tag
(
:div
,
class:
'gpg-badge-popover-avatar'
)
do
content_tag
(
:div
,
class:
'gpg-badge-popover-avatar'
)
do
user_avatar
(
user:
signature
.
gpg_key
.
user
,
size:
32
)
user_avatar_without_link
(
user:
signature
.
gpg_key
.
user
,
size:
32
)
end
end
)
)
...
@@ -246,6 +247,7 @@ module CommitsHelper
...
@@ -246,6 +247,7 @@ module CommitsHelper
end
end
)
)
end
end
end
commit_gpg_signature_badge_with
(
signature
,
label:
'Verified'
,
title:
title
,
content:
content
,
css_classes:
[
'valid'
])
commit_gpg_signature_badge_with
(
signature
,
label:
'Verified'
,
title:
title
,
content:
content
,
css_classes:
[
'valid'
])
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment