summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-08 16:11:41 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-08 16:11:41 +0200
commit46511558815306cf76b0c83637bee018f3caa926 (patch)
tree0d8e0a8505afe1990fddfc45cb0409deed40d028
parent70aecc34cfbdc9dbb10439c4c92679c00f767e2d (diff)
downloadgitlab-ce-46511558815306cf76b0c83637bee018f3caa926.tar.gz
Make system note different from regular comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/pages/notes.scss13
-rw-r--r--app/views/projects/notes/_discussion.html.haml2
2 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index bd9e91a3510..2544356a5f6 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -14,6 +14,19 @@ ul.notes {
margin: 0px;
padding: 0px;
+ .system-note {
+ font-size: 14px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ background: #f8fafc;
+
+ .timeline-icon {
+ .avatar {
+ visibility: hidden;
+ }
+ }
+ }
+
.discussion-header,
.note-header {
@extend .cgray;
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index b8068835b3a..6daf2d15d07 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -1,5 +1,5 @@
- note = discussion_notes.first
-.timeline-entry
+.timeline-entry.prepend-top-default
.timeline-entry-inner
.timeline-icon
= link_to user_path(note.author) do