diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-13 10:06:11 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-13 10:06:11 +0000 |
| commit | 4e18e72e810d50eb8fdea383afb8c9f5771e9f1a (patch) | |
| tree | 1991fe04fcb8453a2719e124d1d3a8e65b7cdc09 /app/views | |
| parent | ac14bd352ed250dc911a8cb006f35af9b95ab99c (diff) | |
| parent | 6d9afdfb835b7d939a7d90f51b0f27bdf6dd58ea (diff) | |
| download | gitlab-ce-4e18e72e810d50eb8fdea383afb8c9f5771e9f1a.tar.gz | |
Merge branch '29189-discussion-button' into 'master'
Fix alignment of resolve discussion button
Closes #29189
See merge request !9865
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index a7618370a5d..5552086bc50 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -43,18 +43,17 @@ "inline-template" => true, "ref" => "note_#{note.id}" } - .note-action-button + %button.note-action-button.line-resolve-btn{ type: "button", + class: ("is-disabled" unless can_resolve), + ":class" => "{ 'is-active': isResolved }", + ":aria-label" => "buttonText", + "@click" => "resolve", + ":title" => "buttonText", + "v-show" => "!loading", + ":ref" => "'button'" } = icon("spin spinner", "v-show" => "loading") - %button.line-resolve-btn{ type: "button", - class: ("is-disabled" unless can_resolve), - ":class" => "{ 'is-active': isResolved }", - ":aria-label" => "buttonText", - "@click" => "resolve", - ":title" => "buttonText", - "v-show" => "!loading", - ":ref" => "'button'" } - = render "shared/icons/icon_status_success.svg" + = render "shared/icons/icon_status_success.svg" - if current_user - if note.emoji_awardable? |