Fix broken UI on commit discussions
This commit is contained in:
parent
132e6c9f95
commit
6e84bfd4ae
|
@ -176,8 +176,10 @@
|
||||||
background-color: $white-light;
|
background-color: $white-light;
|
||||||
}
|
}
|
||||||
|
|
||||||
.discussion-form-container {
|
table {
|
||||||
padding: $gl-padding-top $gl-padding $gl-padding;
|
.discussion-form-container {
|
||||||
|
padding: $gl-padding-top $gl-padding $gl-padding;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.discussion-notes .disabled-comment {
|
.discussion-notes .disabled-comment {
|
||||||
|
|
|
@ -13,12 +13,32 @@ $note-form-margin-left: 72px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.note-wrapper {
|
@mixin outline-comment() {
|
||||||
padding: $gl-padding;
|
margin: $gl-padding;
|
||||||
|
border: 1px solid $border-color;
|
||||||
|
border-radius: $border-radius-default;
|
||||||
}
|
}
|
||||||
|
|
||||||
.issuable-discussion {
|
.note-wrapper {
|
||||||
.notes.timeline > .timeline-entry {
|
padding: $gl-padding;
|
||||||
|
|
||||||
|
&.outlined {
|
||||||
|
@include outline-comment();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-notes-list {
|
||||||
|
@include vertical-line(39px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notes {
|
||||||
|
display: block;
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
&.timeline > .timeline-entry {
|
||||||
border: 1px solid $border-color;
|
border: 1px solid $border-color;
|
||||||
border-radius: $border-radius-default;
|
border-radius: $border-radius-default;
|
||||||
margin: $gl-padding 0;
|
margin: $gl-padding 0;
|
||||||
|
@ -51,18 +71,6 @@ $note-form-margin-left: 72px;
|
||||||
border-top: 1px solid $border-color;
|
border-top: 1px solid $border-color;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.main-notes-list {
|
|
||||||
@include vertical-line(36px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.notes {
|
|
||||||
display: block;
|
|
||||||
list-style: none;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
position: relative;
|
|
||||||
|
|
||||||
> .note-discussion {
|
> .note-discussion {
|
||||||
.card {
|
.card {
|
||||||
|
@ -476,9 +484,7 @@ $note-form-margin-left: 72px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note-wrapper {
|
.note-wrapper {
|
||||||
margin: $gl-padding;
|
@include outline-comment();
|
||||||
border: 1px solid $border-color;
|
|
||||||
border-radius: $border-radius-default;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.discussion-reply-holder {
|
.discussion-reply-holder {
|
||||||
|
@ -488,6 +494,16 @@ $note-form-margin-left: 72px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.commit-diff {
|
||||||
|
.notes {
|
||||||
|
@include vertical-line(52px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.discussion-reply-holder {
|
||||||
|
border-top: 1px solid $border-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.discussion-header,
|
.discussion-header,
|
||||||
.note-header-info {
|
.note-header-info {
|
||||||
a {
|
a {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
.suppressed-container
|
.suppressed-container
|
||||||
%a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show.
|
%a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show.
|
||||||
|
|
||||||
%table.text-file.diff-wrap-lines.code.js-syntax-highlight{ data: diff_view_data, class: too_big ? 'hide' : '' }
|
%table.text-file.diff-wrap-lines.code.js-syntax-highlight.commit-diff{ data: diff_view_data, class: too_big ? 'hide' : '' }
|
||||||
= render partial: "projects/diffs/line",
|
= render partial: "projects/diffs/line",
|
||||||
collection: diff_file.highlighted_diff_lines,
|
collection: diff_file.highlighted_diff_lines,
|
||||||
as: :line,
|
as: :line,
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
- note_editable = can?(current_user, :admin_note, note)
|
- note_editable = can?(current_user, :admin_note, note)
|
||||||
- note_counter = local_assigns.fetch(:note_counter, 0)
|
- note_counter = local_assigns.fetch(:note_counter, 0)
|
||||||
|
|
||||||
%li.timeline-entry{ id: dom_id(note),
|
%li.timeline-entry.note-wrapper.outlined{ id: dom_id(note),
|
||||||
class: ["note", "note-row-#{note.id}", ('system-note' if note.system)],
|
class: ["note", "note-row-#{note.id}", ('system-note' if note.system)],
|
||||||
data: { author_id: note.author.id,
|
data: { author_id: note.author.id,
|
||||||
editable: note_editable,
|
editable: note_editable,
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
- if can_create_note?
|
- if can_create_note?
|
||||||
.notes.notes-form.timeline
|
.notes.notes-form.timeline
|
||||||
.timeline-entry
|
.timeline-entry.note-form
|
||||||
.timeline-entry-inner
|
.timeline-entry-inner
|
||||||
.flash-container.timeline-content
|
.flash-container.timeline-content
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue