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
6f7deb48
Commit
6f7deb48
authored
Apr 06, 2017
by
Annabel Dunstone Gray
Committed by
Jacob Schatz
Apr 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add remaining system note icons
parent
32e4a0f3
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
38 additions
and
12 deletions
+38
-12
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+6
-0
app/helpers/system_note_helper.rb
app/helpers/system_note_helper.rb
+19
-3
app/views/events/event/_common.html.haml
app/views/events/event/_common.html.haml
+1
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+0
-2
app/views/shared/icons/_comment_o.svg
app/views/shared/icons/_comment_o.svg
+1
-1
app/views/shared/icons/_icon_arrow-circle-o-right.svg
app/views/shared/icons/_icon_arrow-circle-o-right.svg
+1
-0
app/views/shared/icons/_icon_check_square_o.svg
app/views/shared/icons/_icon_check_square_o.svg
+1
-0
app/views/shared/icons/_icon_closed.svg
app/views/shared/icons/_icon_closed.svg
+0
-1
app/views/shared/icons/_icon_code_fork.svg
app/views/shared/icons/_icon_code_fork.svg
+1
-1
app/views/shared/icons/_icon_commit.svg
app/views/shared/icons/_icon_commit.svg
+1
-1
app/views/shared/icons/_icon_diamond.svg
app/views/shared/icons/_icon_diamond.svg
+1
-0
app/views/shared/icons/_icon_eye.svg
app/views/shared/icons/_icon_eye.svg
+1
-0
app/views/shared/icons/_icon_eye_slash.svg
app/views/shared/icons/_icon_eye_slash.svg
+1
-0
app/views/shared/icons/_icon_opened.svg
app/views/shared/icons/_icon_opened.svg
+0
-1
app/views/shared/icons/_icon_random.svg
app/views/shared/icons/_icon_random.svg
+1
-0
app/views/shared/icons/_icon_tags.svg
app/views/shared/icons/_icon_tags.svg
+1
-0
app/views/shared/icons/_trash_o.svg
app/views/shared/icons/_trash_o.svg
+1
-1
app/views/shared/icons/icon_clock_o.svg
app/views/shared/icons/icon_clock_o.svg
+1
-0
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
6f7deb48
...
...
@@ -16,6 +16,12 @@ ul.notes {
.timeline-icon
{
float
:
left
;
svg
{
width
:
20px
;
height
:
auto
;
fill
:
$gl-text-color-secondary
;
}
}
.timeline-content
{
...
...
app/helpers/system_note_helper.rb
View file @
6f7deb48
...
...
@@ -10,17 +10,33 @@ module SystemNoteHelper
when
'merged'
'icon_merged'
when
'opened'
'icon_
opened
'
'icon_
status_open
'
when
'closed'
'icon_closed'
'icon_
status_
closed'
when
'time_tracking'
'icon_timer'
when
'assignee'
'icon_user'
when
'title'
'icon_pencil'
when
'task'
'icon_check_square_o'
when
'label'
'icon_tags'
when
'cross_reference'
'icon_random'
when
'branch'
'icon_code_fork'
when
'confidential'
'icon_eye_slash'
when
'visible'
'icon_eye'
when
'milestone'
'icon_clock_o'
when
'moved'
'icon_arrow-circle-o-right'
else
'icon_
status_cancele
d'
'icon_
diamon
d'
end
custom_icon
(
icon_name
)
...
...
app/views/events/event/_common.html.haml
View file @
6f7deb48
...
...
@@ -7,7 +7,7 @@
=
custom_icon
(
"icon_status_closed"
)
-
else
.profile-icon.fork-icon
=
custom_icon
(
"code_fork"
)
=
custom_icon
(
"
icon_
code_fork"
)
.event-title
%span
{
class:
event
.
action_name
}
...
...
app/views/projects/notes/_note.html.haml
View file @
6f7deb48
...
...
@@ -6,9 +6,7 @@
.timeline-entry-inner
.timeline-icon
-
if
note
.
system
-# = render "#{note.system_note_metadata.action}.svg"
=
icon_for_system_note
(
note
)
%h1
=
note
.
system_note_metadata
.
action
.
inspect
-
else
%a
{
href:
user_path
(
note
.
author
)
}
=
image_tag
avatar_icon
(
note
.
author
),
alt:
''
,
class:
'avatar s40'
...
...
app/views/shared/icons/_comment_o.svg
View file @
6f7deb48
app/views/shared/icons/_icon_arrow-circle-o-right.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M1280 896q0 14-9 23l-320 320q-9 9-23 9-13 0-22.5-9.5t-9.5-22.5v-192h-352q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h352v-192q0-14 9-23t23-9q12 0 24 10l319 319q9 9 9 23zm160 0q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"
/></svg>
app/views/shared/icons/_icon_check_square_o.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M1472 930v318q0 119-84.5 203.5t-203.5 84.5h-832q-119 0-203.5-84.5t-84.5-203.5v-832q0-119 84.5-203.5t203.5-84.5h832q63 0 117 25 15 7 18 23 3 17-9 29l-49 49q-10 10-23 10-3 0-9-2-23-6-45-6h-832q-66 0-113 47t-47 113v832q0 66 47 113t113 47h832q66 0 113-47t47-113v-254q0-13 9-22l64-64q10-10 23-10 6 0 12 3 20 8 20 29zm231-489l-814 814q-24 24-57 24t-57-24l-430-430q-24-24-24-57t24-57l110-110q24-24 57-24t57 24l263 263 647-647q24-24 57-24t57 24l110 110q24 24 24 57t-24 57z"
/></svg>
app/views/shared/icons/_icon_closed.svg
deleted
100644 → 0
View file @
32e4a0f3
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M0 7c0-3.866 3.142-7 7-7 3.866 0 7 3.142 7 7 0 3.866-3.142 7-7 7-3.866 0-7-3.142-7-7z"
/><path
d=
"M1 7c0 3.309 2.69 6 6 6 3.309 0 6-2.69 6-6 0-3.309-2.69-6-6-6-3.309 0-6 2.69-6 6z"
fill=
"#FFF"
/><rect
x=
"3.36"
y=
"6.16"
width=
"7.28"
height=
"1.68"
rx=
".84"
/></svg>
app/views/shared/icons/_code_fork.svg
→
app/views/shared/icons/_
icon_
code_fork.svg
View file @
6f7deb48
app/views/shared/icons/_icon_commit.svg
View file @
6f7deb48
app/views/shared/icons/_icon_diamond.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M84 768l623 665-300-665h-323zm812 772l349-772h-698zm-486-900l204-384h-262l-288 384h346zm675 793l623-665h-323zm-530-793h682l-204-384h-274zm827 0h346l-288-384h-262zm141-486l384 512q14 18 13 41.5t-17 40.5l-960 1024q-18 20-47 20t-47-20l-960-1024q-16-17-17-40.5t13-41.5l384-512q18-26 51-26h1152q33 0 51 26z"
/></svg>
app/views/shared/icons/_icon_eye.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M1664 960q-152-236-381-353 61 104 61 225 0 185-131.5 316.5t-316.5 131.5-316.5-131.5-131.5-316.5q0-121 61-225-229 117-381 353 133 205 333.5 326.5t434.5 121.5 434.5-121.5 333.5-326.5zm-720-384q0-20-14-34t-34-14q-125 0-214.5 89.5t-89.5 214.5q0 20 14 34t34 14 34-14 14-34q0-86 61-147t147-61q20 0 34-14t14-34zm848 384q0 34-20 69-140 230-376.5 368.5t-499.5 138.5-499.5-139-376.5-368q-20-35-20-69t20-69q140-229 376.5-368t499.5-139 499.5 139 376.5 368q20 35 20 69z"
/></svg>
app/views/shared/icons/_icon_eye_slash.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M555 1335l78-141q-87-63-136-159t-49-203q0-121 61-225-229 117-381 353 167 258 427 375zm389-759q0-20-14-34t-34-14q-125 0-214.5 89.5t-89.5 214.5q0 20 14 34t34 14 34-14 14-34q0-86 61-147t147-61q20 0 34-14t14-34zm363-191q0 7-1 9-105 188-315 566t-316 567l-49 89q-10 16-28 16-12 0-134-70-16-10-16-28 0-12 44-87-143-65-263.5-173t-208.5-245q-20-31-20-69t20-69q153-235 380-371t496-136q89 0 180 17l54-97q10-16 28-16 5 0 18 6t31 15.5 33 18.5 31.5 18.5 19.5 11.5q16 10 16 27zm37 447q0 139-79 253.5t-209 164.5l280-502q8 45 8 84zm448 128q0 35-20 69-39 64-109 145-150 172-347.5 267t-419.5 95l74-132q212-18 392.5-137t301.5-307q-115-179-282-294l63-112q95 64 182.5 153t144.5 184q20 34 20 69z"
/></svg>
app/views/shared/icons/_icon_opened.svg
deleted
100644 → 0
View file @
32e4a0f3
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M0 7c0-3.866 3.142-7 7-7 3.866 0 7 3.142 7 7 0 3.866-3.142 7-7 7-3.866 0-7-3.142-7-7z"
/><path
d=
"M1 7c0 3.309 2.69 6 6 6 3.309 0 6-2.69 6-6 0-3.309-2.69-6-6-6-3.309 0-6 2.69-6 6z"
fill=
"#FFF"
/><path
d=
"M7 9.219a2.218 2.218 0 1 0 0-4.436A2.218 2.218 0 0 0 7 9.22zm0 1.12a3.338 3.338 0 1 1 0-6.676 3.338 3.338 0 0 1 0 6.676z"
/></svg>
app/views/shared/icons/_icon_random.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M666 481q-60 92-137 273-22-45-37-72.5t-40.5-63.5-51-56.5-63-35-81.5-14.5h-224q-14 0-23-9t-9-23v-192q0-14 9-23t23-9h224q250 0 410 225zm1126 799q0 14-9 23l-320 320q-9 9-23 9-13 0-22.5-9.5t-9.5-22.5v-192q-32 0-85 .5t-81 1-73-1-71-5-64-10.5-63-18.5-58-28.5-59-40-55-53.5-56-69.5q59-93 136-273 22 45 37 72.5t40.5 63.5 51 56.5 63 35 81.5 14.5h256v-192q0-14 9-23t23-9q12 0 24 10l319 319q9 9 9 23zm0-896q0 14-9 23l-320 320q-9 9-23 9-13 0-22.5-9.5t-9.5-22.5v-192h-256q-48 0-87 15t-69 45-51 61.5-45 77.5q-32 62-78 171-29 66-49.5 111t-54 105-64 100-74 83-90 68.5-106.5 42-128 16.5h-224q-14 0-23-9t-9-23v-192q0-14 9-23t23-9h224q48 0 87-15t69-45 51-61.5 45-77.5q32-62 78-171 29-66 49.5-111t54-105 64-100 74-83 90-68.5 106.5-42 128-16.5h256v-192q0-14 9-23t23-9q12 0 24 10l319 319q9 9 9 23z"
/></svg>
app/views/shared/icons/_icon_tags.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M384 448q0-53-37.5-90.5t-90.5-37.5-90.5 37.5-37.5 90.5 37.5 90.5 90.5 37.5 90.5-37.5 37.5-90.5zm1067 576q0 53-37 90l-491 492q-39 37-91 37-53 0-90-37l-715-716q-38-37-64.5-101t-26.5-117v-416q0-52 38-90t90-38h416q53 0 117 26.5t102 64.5l715 714q37 39 37 91zm384 0q0 53-37 90l-491 492q-39 37-91 37-36 0-59-14t-53-45l470-470q37-37 37-90 0-52-37-91l-715-714q-38-38-102-64.5t-117-26.5h224q53 0 117 26.5t102 64.5l715 714q37 39 37 91z"
/></svg>
app/views/shared/icons/_trash_o.svg
View file @
6f7deb48
app/views/shared/icons/icon_clock_o.svg
0 → 100644
View file @
6f7deb48
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"
/></svg>
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