Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
2aaccfc2ed40
Commit
0dd71ed4
authored
Aug 23, 2017
by
Annabel Dunstone Gray
Browse files
Fix alignment of gpg status
parent
e970909d8cd6
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/pages/commits.scss
View file @
2aaccfc2
...
...
@@ -286,6 +286,9 @@
.gpg-status-box
{
padding
:
2px
10px
;
margin-right
:
$gl-padding
;
&
:empty
{
display
:
none
;
}
...
...
@@ -314,7 +317,6 @@
&
.valid
{
svg
{
border
:
1px
solid
$brand-success
;
fill
:
$brand-success
;
}
}
...
...
@@ -322,7 +324,6 @@
&
.invalid
{
svg
{
border
:
1px
solid
$common-gray-light
;
fill
:
$common-gray-light
;
}
}
...
...
app/helpers/commits_helper.rb
View file @
2aaccfc2
...
...
@@ -114,7 +114,7 @@ def cherry_pick_commit_link(commit, continue_to_path, btn_class: nil, has_toolti
end
def
commit_signature_badge_classes
(
additional_classes
)
%w(btn
status-box
gpg-status-box)
+
Array
(
additional_classes
)
%w(btn gpg-status-box)
+
Array
(
additional_classes
)
end
protected
...
...
app/views/projects/commits/_commit.html.haml
View file @
2aaccfc2
...
...
@@ -37,14 +37,14 @@
.commit-actions.hidden-xs
-
if
commit
.
status
(
ref
)
=
render_commit_status
(
commit
,
ref:
ref
)
-
if
request
.
xhr?
=
render
partial:
'projects/commit/signature'
,
object:
commit
.
signature
-
else
=
render
partial:
'projects/commit/ajax_signature'
,
locals:
{
commit:
commit
}
-
if
commit
.
status
(
ref
)
=
render_commit_status
(
commit
,
ref:
ref
)
=
link_to
commit
.
short_id
,
project_commit_path
(
project
,
commit
),
class:
"commit-sha btn btn-transparent"
=
clipboard_button
(
text:
commit
.
id
,
title:
_
(
"Copy commit SHA to clipboard"
))
=
link_to_browse_code
(
project
,
commit
)
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