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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
febf229b
Commit
febf229b
authored
6 years ago
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Uses sprite icon to render verified commit badge and uniforms css colors
parent
9f5390d8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
11 deletions
+14
-11
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+4
-4
app/views/projects/commit/_other_user_signature_badge.html.haml
...ews/projects/commit/_other_user_signature_badge.html.haml
+1
-1
app/views/projects/commit/_same_user_different_email_signature_badge.html.haml
...mmit/_same_user_different_email_signature_badge.html.haml
+1
-1
app/views/projects/commit/_signature_badge.html.haml
app/views/projects/commit/_signature_badge.html.haml
+1
-1
app/views/projects/commit/_unverified_signature_badge.html.haml
...ews/projects/commit/_unverified_signature_badge.html.haml
+1
-1
app/views/projects/commit/_verified_signature_badge.html.haml
...views/projects/commit/_verified_signature_badge.html.haml
+1
-1
app/views/shared/icons/_icon_status_notfound_borderless.svg
app/views/shared/icons/_icon_status_notfound_borderless.svg
+0
-1
app/views/shared/icons/_icon_status_success_borderless.svg
app/views/shared/icons/_icon_status_success_borderless.svg
+0
-1
changelogs/unreleased/42285-not-found-status-icon.yml
changelogs/unreleased/42285-not-found-status-icon.yml
+5
-0
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
febf229b
...
...
@@ -310,8 +310,8 @@
}
&
.invalid
{
@include
status-color
(
$gray-dark
,
$gray
,
$
common-gray-dark
);
border-color
:
$
common-gray-ligh
t
;
@include
status-color
(
$gray-dark
,
$gray
,
$
gray-darkest
);
border-color
:
$
gray-darkes
t
;
}
}
...
...
@@ -335,8 +335,8 @@
&
.invalid
{
svg
{
border
:
1px
solid
$
common-gray-ligh
t
;
fill
:
$
common-gray-ligh
t
;
border
:
1px
solid
$
gray-darkes
t
;
fill
:
$
gray-darkes
t
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_other_user_signature_badge.html.haml
View file @
febf229b
-
title
=
capture
do
This commit was signed with a different user's verified signature.
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
'invalid'
,
icon:
'
icon_
status_notfound_borderless'
,
show_user:
true
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
'invalid'
,
icon:
'status_notfound_borderless'
,
show_user:
true
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_same_user_different_email_signature_badge.html.haml
View file @
febf229b
...
...
@@ -2,6 +2,6 @@
This commit was signed with a verified signature, but the committer email
is
<strong>
not verified
</strong>
to belong to the same user.
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
[
'invalid'
],
icon:
'
icon_
status_notfound_borderless'
,
show_user:
true
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
[
'invalid'
],
icon:
'status_notfound_borderless'
,
show_user:
true
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_signature_badge.html.haml
View file @
febf229b
...
...
@@ -10,7 +10,7 @@
-
title
=
capture
do
.gpg-popover-status
.gpg-popover-icon
{
class:
css_class
}
=
render
"shared/icons/
#{
icon
}
.svg"
=
sprite_icon
(
icon
)
%div
=
title
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_unverified_signature_badge.html.haml
View file @
febf229b
-
title
=
capture
do
This commit was signed with an
<strong>
unverified
</strong>
signature.
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
'invalid'
,
icon:
'
icon_
status_notfound_borderless'
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Unverified'
,
css_class:
'invalid'
,
icon:
'status_notfound_borderless'
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_verified_signature_badge.html.haml
View file @
febf229b
...
...
@@ -2,6 +2,6 @@
This commit was signed with a
<strong>
verified
</strong>
signature and the
committer email is verified to belong to the same user.
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Verified'
,
css_class:
'valid'
,
icon:
'
icon_
status_success_borderless'
,
show_user:
true
}
-
locals
=
{
signature:
signature
,
title:
title
,
label:
'Verified'
,
css_class:
'valid'
,
icon:
'status_success_borderless'
,
show_user:
true
}
=
render
partial:
'projects/commit/signature_badge'
,
locals:
locals
This diff is collapsed.
Click to expand it.
app/views/shared/icons/_icon_status_notfound_borderless.svg
deleted
100644 → 0
View file @
9f5390d8
<svg
width=
"22"
height=
"22"
viewBox=
"0 0 22 22"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M12.822 11.29c.816-.581 1.421-1.348 1.683-2.322.603-2.243-.973-4.553-3.53-4.553-1.15 0-2.085.41-2.775 1.089-.42.413-.672.835-.8 1.167a1.179 1.179 0 0 0 2.2.847c.016-.043.1-.184.252-.334.264-.259.613-.412 1.123-.412.938 0 1.47.78 1.254 1.584-.105.39-.37.726-.773 1.012a3.25 3.25 0 0 1-.945.47 1.179 1.179 0 0 0-.874 1.138v2.234a1.179 1.179 0 1 0 2.358 0V11.78a5.9 5.9 0 0 0 .827-.492z"
fill-rule=
"nonzero"
/><ellipse
cx=
"10.825"
cy=
"16.711"
rx=
"1.275"
ry=
"1.322"
/></svg>
This diff is collapsed.
Click to expand it.
app/views/shared/icons/_icon_status_success_borderless.svg
deleted
100644 → 0
View file @
9f5390d8
<svg
width=
"22px"
height=
"22px"
viewBox=
"0 0 22 22"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M11.4583333,12.375 L8.70008808,12.375 C8.45889044,12.375 8.25,12.5826293 8.25,12.8387529 L8.25,14.2029137 C8.25,14.4551799 8.4515113,14.6666667 8.70008808,14.6666667 L12.9619841,14.6666667 C13.3891296,14.6666667 13.75,14.3193051 13.75,13.8908129 L13.75,13.2899463 L13.75,6.42552703 C13.75,6.16226705 13.5423707,5.95833333 13.2862471,5.95833333 L11.9220863,5.95833333 C11.6698201,5.95833333 11.4583333,6.16750307 11.4583333,6.42552703 L11.4583333,12.375 Z"
id=
"Combined-Shape"
transform=
"translate(11.000000, 10.312500) rotate(-315.000000) translate(-11.000000, -10.312500) "
></path></svg>
This diff is collapsed.
Click to expand it.
changelogs/unreleased/42285-not-found-status-icon.yml
0 → 100644
View file @
febf229b
---
title
:
Replace verified badge icons and uniform colors
merge_request
:
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
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