Commit 44cb5803 authored by Phil Hughes's avatar Phil Hughes Committed by Douwe Maan

Seperated resolve all button from reply button

parent c1fe066b
......@@ -156,27 +156,32 @@
.discussion-reply-holder {
background-color: $white-light;
padding: 10px 16px;
.btn-group-justified {
table-layout: auto;
}
}
.btn-group:first-child {
.discussion-with-resolve-btn {
display: table;
width: 100%;
}
border-collapse: separate;
table-layout: auto;
.btn-group {
display: table-cell;
float: none;
width: 1%;
.discussion-with-resolve-btn {
.btn-group:first-child .btn {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
&:first-child {
width: 100%;
padding-right: 5px;
}
.btn-group:last-child .btn {
margin-left: -1px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
&:last-child {
padding-left: 5px;
}
}
.btn {
width: 100%;
}
}
......
......@@ -5,8 +5,8 @@
= render partial: "projects/notes/note", collection: discussion.notes, as: :note
.discussion-reply-holder
.btn-group-justified.discussion-with-resolve-btn{ role: "group" }
.btn-group{ role: "group" }
.discussion-with-resolve-btn{ role: "group" }
.btn-group
= link_to_reply_discussion(note)
.btn-group{ role: "group" }
.btn-group
= render "projects/notes/discussions/resolve_all", note: note
......@@ -20,7 +20,7 @@
- access = note_max_access_for_user(note)
- if access and not note.system
%span.note-role.hidden-xs= access
- if !note.system && current_user
- if !note.system && note.discussion_id && current_user
%resolve-btn{ ":namespace" => "'#{note.project.namespace.path}/#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", ":note-id" => note.id, ":resolved" => "false", "inline-template" => true, "v-ref:note_#{note.id}" => true }
.note-action-button
= icon("spin spinner", "v-show" => "loading")
......
%resolve-all{ ":namespace" => "'#{note.project.namespace.path}/#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", "inline-template" => true, "v-cloak" => true }
%button.btn.btn-success{ type: "button", "@click" => "resolve", ":disabled" => "loading" }
%button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading" }
= icon("spinner spin", "v-show" => "loading")
{{ buttonText }}
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