diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-15 23:07:03 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-15 23:07:03 +0000 |
| commit | a2801ec429a0ac02e622d61119439ff71150acf2 (patch) | |
| tree | 5fa76cafe25bfbfb1eea94b7743457ec30eb91fc | |
| parent | 5ad1d40c7f2858a06a7af9ea68a5d9531d936cc9 (diff) | |
| parent | 0fe942c67137d6c0551eb390666735a59df37d01 (diff) | |
| download | gitlab-ce-a2801ec429a0ac02e622d61119439ff71150acf2.tar.gz | |
Merge branch '27959-style-note-links' into 'master'
style links on system notes to look clickable
Closes #27959
See merge request !9251
| -rw-r--r-- | app/assets/javascripts/notes.js | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 11 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 3579843baed..0464b895d6d 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -923,9 +923,10 @@ 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'); $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? |