Commit 4e18e72e authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '29189-discussion-button' into 'master'

Fix alignment of resolve discussion button

Closes #29189

See merge request !9865
parents ac14bd35 6d9afdfb
......@@ -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;
}
}
......
......@@ -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?
......
---
title: Fix alignment of resolve button
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment