From 7b69580e1d99049684ea154e0d3a2dbfbce0e976 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Wed, 15 Feb 2017 13:30:07 +1100
Subject: style links on system notes to look clickable

---
 app/assets/javascripts/notes.js          |  1 +
 app/assets/stylesheets/pages/notes.scss  | 11 +----------
 app/views/projects/notes/_note.html.haml |  1 +
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 3579843baed..90abce0405d 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -926,6 +926,7 @@ require('vendor/task_list');
       const $element = $(e.target);
       const $closestSystemCommitList = $element.siblings('.system-note-commit-list');
 
+      $element.find('.fa').toggleClass('fa-angle-down').toggleClass('fa-angle-up');
       $closestSystemCommitList.toggleClass('hide-shade');
     };
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index f310cc72da0..aa130a1abb0 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -72,6 +72,7 @@ ul.notes {
       overflow: hidden;
 
       .system-note-commit-list-toggler {
+        color: $gl-link-color;
         display: none;
         padding: 10px 0 0;
         cursor: pointer;
@@ -107,16 +108,6 @@ ul.notes {
             display: none;
           }
 
-          p:last-child {
-            a {
-              color: $gl-text-color;
-
-              &:hover {
-                color: $gl-link-color;
-              }
-            }
-          }
-
           &::after {
             content: '';
             width: 100%;
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index e58de9f0e18..1b08165c14c 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -77,6 +77,7 @@
         - if note.system
           .system-note-commit-list-toggler
             Toggle commit list
+            %i.fa.fa-angle-down
       - if note.attachment.url
         .note-attachment
           - if note.attachment.image?
-- 
cgit v1.2.1


From 0fe942c67137d6c0551eb390666735a59df37d01 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 16 Feb 2017 06:27:22 +1100
Subject: allow clicking on text or icon to trigger expand

---
 app/assets/javascripts/notes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 90abce0405d..0464b895d6d 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -923,7 +923,7 @@ require('vendor/task_list');
     };
 
     Notes.prototype.toggleCommitList = function(e) {
-      const $element = $(e.target);
+      const $element = $(e.currentTarget);
       const $closestSystemCommitList = $element.siblings('.system-note-commit-list');
 
       $element.find('.fa').toggleClass('fa-angle-down').toggleClass('fa-angle-up');
-- 
cgit v1.2.1