diff options
author | Nur Rony <pro.nmrony@gmail.com> | 2016-11-21 22:26:47 +0300 |
---|---|---|
committer | Nur Rony <pro.nmrony@gmail.com> | 2016-11-22 11:44:59 +0300 |
commit | b86a784e1d9bb3dc789e2b289efe7b25e844d5aa (patch) | |
tree | b667fd99b4548ab86db1396867b9d1ec375f6f00 /app | |
parent | 60c2d5907226be8cca4b911cf5a85779ab587dd2 (diff) |
resolves lowercase issue in system note for labels, label description and title
removes unnecessary changelog entry
makes toggle commit list and compare link as secondary
removes unnecessary function call
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/notes.js | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 35 | ||||
-rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
3 files changed, 31 insertions, 7 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 6cb87f9ba81..a84c514dac7 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -113,6 +113,7 @@ $(document).off("click", ".js-note-discard"); $(document).off("keydown", ".js-note-text"); $(document).off('click', '.js-comment-resolve-button'); + $(document).off("click", '.system-note-commit-list-toggler'); $('.note .js-task-list-container').taskList('disable'); return $(document).off('tasklist:changed', '.note .js-task-list-container'); }; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 0dfd4ab7ec9..54c7caed8ed 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -43,12 +43,25 @@ ul.notes { } .system-note-message { - text-transform: lowercase; + display: inline-block; + + &::first-letter { + text-transform: lowercase; + } a { color: $gl-link-color; text-decoration: none; } + + p { + display: inline-block; + margin: 0; + + &::first-letter { + text-transform: lowercase; + } + } } .timeline-content { @@ -62,6 +75,11 @@ ul.notes { display: none; padding: 10px 0 0; cursor: pointer; + + &:hover { + color: $gl-link-color; + text-decoration: underline; + } } .note-text { @@ -87,6 +105,16 @@ ul.notes { display: none; } + p:last-child { + a { + color: $gl-text-color; + + &:hover { + color: $gl-link-color; + } + } + } + &::after { content: ''; width: 100%; @@ -188,11 +216,6 @@ ul.notes { padding-bottom: 3px; padding-right: 20px; - p { - display: inline; - margin: 0; - } - @media (min-width: $screen-sm-min) { padding-right: 0; } diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 89ae64554c0..ba8895438c5 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -16,7 +16,7 @@ commented - if note.system %span{class: 'system-note-message'} - = h(note.note_html.downcase.html_safe) + = note.redacted_note_html %a{ href: "##{dom_id(note)}" } = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') - unless note.system? |