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
Jérome Perrin
gitlab-ce
Commits
b90f83e9
Commit
b90f83e9
authored
Mar 31, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start adding profile icons
parent
2faf955c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
13 deletions
+23
-13
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+6
-10
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+3
-2
app/views/events/event/_common.html.haml
app/views/events/event/_common.html.haml
+9
-1
app/views/shared/icons/_code_fork.svg
app/views/shared/icons/_code_fork.svg
+1
-0
app/views/shared/icons/_comment_o.svg
app/views/shared/icons/_comment_o.svg
+1
-0
app/views/shared/icons/_icon_status_closed.svg
app/views/shared/icons/_icon_status_closed.svg
+1
-0
app/views/shared/icons/_icon_status_open.svg
app/views/shared/icons/_icon_status_open.svg
+1
-0
app/views/shared/icons/_trash_o.svg
app/views/shared/icons/_trash_o.svg
+1
-0
No files found.
app/assets/stylesheets/pages/events.scss
View file @
b90f83e9
...
@@ -4,16 +4,11 @@
...
@@ -4,16 +4,11 @@
*/
*/
.event-item
{
.event-item
{
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
padding
:
$gl-padding
-top
0
$gl-padding-top
(
$gl-avatar-size
+
$gl-padding-top
)
;
padding
:
$gl-padding
;
border-bottom
:
1px
solid
$white-normal
;
border-bottom
:
1px
solid
$white-normal
;
color
:
$list-text-color
;
color
:
$list-text-color
;
&
.event-inline
{
&
.event-inline
{
.avatar
{
position
:
relative
;
top
:
-2px
;
}
.event-title
,
.event-title
,
.event-item-timestamp
{
.event-item-timestamp
{
line-height
:
40px
;
line-height
:
40px
;
...
@@ -24,16 +19,17 @@
...
@@ -24,16 +19,17 @@
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
.avatar
{
margin-left
:
-
(
$gl-avatar-size
+
$gl-padding-top
);
}
.event-title
{
.event-title
{
@include
str-truncated
(
calc
(
100%
-
174px
));
@include
str-truncated
(
calc
(
100%
-
174px
));
font-weight
:
600
;
font-weight
:
600
;
color
:
$list-text-color
;
color
:
$list-text-color
;
}
}
svg
{
height
:
16px
;
width
:
16px
;
}
.event-body
{
.event-body
{
margin-right
:
174px
;
margin-right
:
174px
;
...
...
app/views/events/_event.html.haml
View file @
b90f83e9
...
@@ -3,13 +3,14 @@
...
@@ -3,13 +3,14 @@
.event-item-timestamp
.event-item-timestamp
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
=
author_avatar
(
event
,
size:
40
)
-
if
event
.
created_project?
-
if
event
.
created_project?
=
custom_icon
(
"icon_status_open"
)
=
render
"events/event/created_project"
,
event:
event
=
render
"events/event/created_project"
,
event:
event
-
elsif
event
.
push?
-
elsif
event
.
push?
=
custom_icon
(
"icon_commit"
)
=
render
"events/event/push"
,
event:
event
=
render
"events/event/push"
,
event:
event
-
elsif
event
.
commented?
-
elsif
event
.
commented?
=
custom_icon
(
"comment_o"
)
=
render
"events/event/note"
,
event:
event
=
render
"events/event/note"
,
event:
event
-
else
-
else
=
render
"events/event/common"
,
event:
event
=
render
"events/event/common"
,
event:
event
app/views/events/event/_common.html.haml
View file @
b90f83e9
-
if
event
.
target
-
if
event
.
target_type
==
"MergeRequest"
-
if
event
.
action_name
==
"opened"
=
custom_icon
(
"icon_status_open"
)
-
elsif
event
.
action_name
==
"closed"
=
custom_icon
(
"icon_status_closed"
)
-
else
=
custom_icon
(
"code_fork"
)
.event-title
.event-title
%span
.author_name
=
link_to_author
event
%span
{
class:
event
.
action_name
}
%span
{
class:
event
.
action_name
}
-
if
event
.
target
-
if
event
.
target
=
event
.
action_name
=
event
.
action_name
...
...
app/views/shared/icons/_code_fork.svg
0 → 100644
View file @
b90f83e9
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M672 1472q0-40-28-68t-68-28-68 28-28 68 28 68 68 28 68-28 28-68zm0-1152q0-40-28-68t-68-28-68 28-28 68 28 68 68 28 68-28 28-68zm640 128q0-40-28-68t-68-28-68 28-28 68 28 68 68 28 68-28 28-68zm96 0q0 52-26 96.5t-70 69.5q-2 287-226 414-68 38-203 81-128 40-169.5 71t-41.5 100v26q44 25 70 69.5t26 96.5q0 80-56 136t-136 56-136-56-56-136q0-52 26-96.5t70-69.5v-820q-44-25-70-69.5t-26-96.5q0-80 56-136t136-56 136 56 56 136q0 52-26 96.5t-70 69.5v497q54-26 154-57 55-17 87.5-29.5t70.5-31 59-39.5 40.5-51 28-69.5 8.5-91.5q-44-25-70-69.5t-26-96.5q0-80 56-136t136-56 136 56 56 136z"
/></svg>
\ No newline at end of file
app/views/shared/icons/_comment_o.svg
0 → 100644
View file @
b90f83e9
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M896 384q-204 0-381.5 69.5t-282 187.5-104.5 255q0 112 71.5 213.5t201.5 175.5l87 50-27 96q-24 91-70 172 152-63 275-171l43-38 57 6q69 8 130 8 204 0 381.5-69.5t282-187.5 104.5-255-104.5-255-282-187.5-381.5-69.5zm896 512q0 174-120 321.5t-326 233-450 85.5q-70 0-145-8-198 175-460 242-49 14-114 22h-5q-15 0-27-10.5t-16-27.5v-1q-3-4-.5-12t2-10 4.5-9.5l6-9 7-8.5 8-9q7-8 31-34.5t34.5-38 31-39.5 32.5-51 27-59 26-76q-157-89-247.5-220t-90.5-281q0-174 120-321.5t326-233 450-85.5 450 85.5 326 233 120 321.5z"
/></svg>
\ No newline at end of file
app/views/shared/icons/_icon_status_closed.svg
0 → 100644
View file @
b90f83e9
<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/_icon_status_open.svg
0 → 100644
View file @
b90f83e9
<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/_trash_o.svg
0 → 100644
View file @
b90f83e9
<svg
width=
"1792"
height=
"1792"
viewBox=
"0 0 1792 1792"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M704 736v576q0 14-9 23t-23 9h-64q-14 0-23-9t-9-23v-576q0-14 9-23t23-9h64q14 0 23 9t9 23zm256 0v576q0 14-9 23t-23 9h-64q-14 0-23-9t-9-23v-576q0-14 9-23t23-9h64q14 0 23 9t9 23zm256 0v576q0 14-9 23t-23 9h-64q-14 0-23-9t-9-23v-576q0-14 9-23t23-9h64q14 0 23 9t9 23zm128 724v-948h-896v948q0 22 7 40.5t14.5 27 10.5 8.5h832q3 0 10.5-8.5t14.5-27 7-40.5zm-672-1076h448l-48-117q-7-9-17-11h-317q-10 2-17 11zm928 32v64q0 14-9 23t-23 9h-96v948q0 83-47 143.5t-113 60.5h-832q-66 0-113-58.5t-47-141.5v-952h-96q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h309l70-167q15-37 54-63t79-26h320q40 0 79 26t54 63l70 167h309q14 0 23 9t9 23z"
/></svg>
\ No newline at end of file
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