diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-10 11:29:21 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-10 13:43:02 -0600 |
| commit | 6d9afdfb835b7d939a7d90f51b0f27bdf6dd58ea (patch) | |
| tree | ee2cabaf5980263b1a57d31c5c0634a15206d215 | |
| parent | c4ba6ea684052ff555e8683c23be5b25bf5abd11 (diff) | |
| download | gitlab-ce-29189-discussion-button.tar.gz | |
Fix alignment of resolve discussion button29189-discussion-button
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 19 | ||||
| -rw-r--r-- | changelogs/unreleased/29189-discussion-button.yml | 4 |
3 files changed, 17 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index dc79de19d48..c8ad88e9351 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -384,7 +384,7 @@ ul.notes { top: 0; .note-action-button { - margin-left: 10px; + margin-left: 8px; } } @@ -400,8 +400,7 @@ ul.notes { } .note-action-button { - display: inline-block; - margin-left: 0; + display: inline; line-height: 20px; @media (min-width: $screen-sm-min) { @@ -540,7 +539,6 @@ ul.notes { } .line-resolve-btn { - display: inline-block; position: relative; top: 2px; padding: 0; @@ -563,8 +561,9 @@ ul.notes { } svg { - position: relative; fill: $gray-darkest; + height: 15px; + width: 15px; } } 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? diff --git a/changelogs/unreleased/29189-discussion-button.yml b/changelogs/unreleased/29189-discussion-button.yml new file mode 100644 index 00000000000..eea96362117 --- /dev/null +++ b/changelogs/unreleased/29189-discussion-button.yml @@ -0,0 +1,4 @@ +--- +title: Fix alignment of resolve button +merge_request: +author: |