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
a9761ac1
Commit
a9761ac1
authored
Dec 20, 2014
by
Drew Blessing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Differentiate system notes
parent
0f7d47f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
2 deletions
+43
-2
app/assets/stylesheets/generic/timeline.scss
app/assets/stylesheets/generic/timeline.scss
+36
-0
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+7
-2
No files found.
app/assets/stylesheets/generic/timeline.scss
View file @
a9761ac1
...
...
@@ -74,6 +74,42 @@
}
}
}
.system-note
.timeline-entry-inner
{
.timeline-icon
{
background
:
none
;
margin-left
:
12px
;
margin-top
:
0
;
@include
box-shadow
(
none
);
span
{
margin
:
0
2px
;
font-size
:
16px
;
color
:
#eeeeee
;
}
}
.timeline-content
{
background
:
none
;
margin-left
:
45px
;
padding
:
0px
15px
;
&
:after
{
border
:
0
;
}
.note-header
{
span
{
font-size
:
12px
;
}
.avatar
{
margin-right
:
5px
;
}
}
.note-text
{
font-size
:
12px
;
margin-left
:
20px
;
}
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
...
...
app/views/projects/notes/_note.html.haml
View file @
a9761ac1
%li
.timeline-entry
{
id:
dom_id
(
note
),
class:
dom_class
(
note
)
,
data:
{
discussion:
note
.
discussion_id
}
}
%li
.timeline-entry
{
id:
dom_id
(
note
),
class:
[
dom_class
(
note
),
(
'system-note'
if
note
.
system
)]
,
data:
{
discussion:
note
.
discussion_id
}
}
.timeline-entry-inner
.timeline-icon
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s40"
-
if
note
.
system
%span
.fa.fa-circle
-
else
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s40"
.timeline-content
.note-header
.note-actions
...
...
@@ -17,6 +20,8 @@
=
link_to
project_note_path
(
@project
,
note
),
title:
"Remove comment"
,
method: :delete
,
data:
{
confirm:
'Are you sure you want to remove this comment?'
},
remote:
true
,
class:
"danger js-note-delete"
do
%i
.fa.fa-trash-o.cred
Remove
-
if
note
.
system
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s16"
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
%span
.author-username
=
'@'
+
note
.
author
.
username
...
...
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