diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 16:24:32 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 16:24:32 +0100 |
| commit | 05339515631d93f0fb8d9526693017af91cbf5d5 (patch) | |
| tree | ec9c598b235986ae42431d0430cc50e4179285c5 | |
| parent | b70d828f836f58aa9bc1af34fb6019857524619f (diff) | |
| download | gitlab-ce-05339515631d93f0fb8d9526693017af91cbf5d5.tar.gz | |
Add link to list items
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 15 | ||||
| -rw-r--r-- | app/views/projects/notes/_comment_button.html.haml | 28 |
2 files changed, 28 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index c71a4e717f8..6d6e037d3e6 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -333,10 +333,21 @@ } li { - white-space: nowrap; - cursor: pointer; padding-top: 6px; + & > a { + margin: 0; + padding: 0; + color: inherit; + border-radius: 0; + + &:hover, + &:focus { + background-color: inherit; + color: inherit; + } + } + &:hover, &:focus { background-color: $dropdown-hover-color; diff --git a/app/views/projects/notes/_comment_button.html.haml b/app/views/projects/notes/_comment_button.html.haml index 8627713fd68..db18322c8eb 100644 --- a/app/views/projects/notes/_comment_button.html.haml +++ b/app/views/projects/notes/_comment_button.html.haml @@ -9,20 +9,22 @@ %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } %li#comment.droplab-item-selected{ data: { value: '', 'submit-text' => 'Comment', 'close-text' => "Comment & close #{noteable_name}", 'reopen-text' => "Comment & reopen #{noteable_name}" } } - = icon('check') - .description - %strong Comment - %p - Add a general comment to this #{noteable_name}. + %a{ href: '#' } + = icon('check') + .description + %strong Comment + %p + Add a general comment to this #{noteable_name}. %li.divider %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => 'Start discussion', 'close-text' => "Start discussion & close #{noteable_name}", 'reopen-text' => "Start discussion & reopen #{noteable_name}" } } - = icon('check') - .description - %strong Start discussion - %p - = succeed '.' do - Discuss a specific suggestion or question - - if @note.noteable.supports_resolvable_notes? - that needs to be resolved + %a{ href: '#' } + = icon('check') + .description + %strong Start discussion + %p + = succeed '.' do + Discuss a specific suggestion or question + - if @note.noteable.supports_resolvable_notes? + that needs to be resolved |