Merge branch 'revert-93869c63' into 'master'
Revert "Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request" Closes #45288 See merge request gitlab-org/gitlab-ce!18346
This commit is contained in:
commit
64f91be000
|
@ -1190,12 +1190,12 @@ export default class Notes {
|
|||
addForm = false;
|
||||
let lineTypeSelector = '';
|
||||
rowCssToAdd =
|
||||
'<tr class="notes_holder js-temp-notes-holder"><td class="notes_line" colspan="2"></td><td class="notes_content"><div class="content discussion-notes"></div></td></tr>';
|
||||
'<tr class="notes_holder js-temp-notes-holder"><td class="notes_line" colspan="2"></td><td class="notes_content"><div class="content"></div></td></tr>';
|
||||
// In parallel view, look inside the correct left/right pane
|
||||
if (this.isParallelView()) {
|
||||
lineTypeSelector = `.${lineType}`;
|
||||
rowCssToAdd =
|
||||
'<tr class="notes_holder js-temp-notes-holder"><td class="notes_line old"></td><td class="notes_content parallel old"><div class="content discussion-notes"></div></td><td class="notes_line new"></td><td class="notes_content parallel new"><div class="content discussion-notes"></div></td></tr>';
|
||||
'<tr class="notes_holder js-temp-notes-holder"><td class="notes_line old"></td><td class="notes_content parallel old"><div class="content"></div></td><td class="notes_line new"></td><td class="notes_content parallel new"><div class="content"></div></td></tr>';
|
||||
}
|
||||
const notesContentSelector = `.notes_content${lineTypeSelector} .content`;
|
||||
let notesContent = targetRow.find(notesContentSelector);
|
||||
|
|
|
@ -258,7 +258,9 @@ Please check your network connection and try again.`;
|
|||
:key="note.id"
|
||||
/>
|
||||
</ul>
|
||||
<div class="discussion-reply-holder">
|
||||
<div
|
||||
:class="{ 'is-replying': isReplying }"
|
||||
class="discussion-reply-holder">
|
||||
<template v-if="!isReplying && canReply">
|
||||
<div
|
||||
class="btn-group-justified discussion-with-resolve-btn"
|
||||
|
|
|
@ -813,7 +813,6 @@
|
|||
}
|
||||
|
||||
.discussion-notes {
|
||||
padding: 0 $gl-padding $gl-padding;
|
||||
min-height: 35px;
|
||||
|
||||
&:first-child {
|
||||
|
|
|
@ -173,7 +173,11 @@
|
|||
}
|
||||
|
||||
.discussion-form {
|
||||
padding-top: $gl-padding-top;
|
||||
background-color: $white-light;
|
||||
}
|
||||
|
||||
.discussion-form-container {
|
||||
padding: $gl-padding-top $gl-padding $gl-padding;
|
||||
}
|
||||
|
||||
.discussion-notes .disabled-comment {
|
||||
|
@ -233,7 +237,12 @@
|
|||
.discussion-body,
|
||||
.diff-file {
|
||||
.discussion-reply-holder {
|
||||
padding-top: $gl-padding;
|
||||
background-color: $white-light;
|
||||
padding: 10px 16px;
|
||||
|
||||
&.is-replying {
|
||||
padding-bottom: $gl-padding;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ ul.notes {
|
|||
}
|
||||
|
||||
.timeline-entry-inner {
|
||||
padding: $gl-padding 0;
|
||||
padding: $gl-padding $gl-btn-padding;
|
||||
border-bottom: 1px solid $white-normal;
|
||||
}
|
||||
|
||||
|
@ -94,6 +94,12 @@ ul.notes {
|
|||
}
|
||||
}
|
||||
|
||||
&.note-discussion {
|
||||
.timeline-entry-inner {
|
||||
padding: $gl-padding 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.editing-spinner {
|
||||
display: none;
|
||||
}
|
||||
|
@ -346,8 +352,6 @@ ul.notes {
|
|||
}
|
||||
|
||||
.discussion-notes {
|
||||
background-color: $white-light;
|
||||
|
||||
&:not(:first-child) {
|
||||
border-top: 1px solid $white-normal;
|
||||
margin-top: 20px;
|
||||
|
@ -359,6 +363,10 @@ ul.notes {
|
|||
}
|
||||
}
|
||||
|
||||
.notes {
|
||||
background-color: $white-light;
|
||||
}
|
||||
|
||||
a code {
|
||||
top: 0;
|
||||
margin-right: 0;
|
||||
|
@ -639,6 +647,8 @@ ul.notes {
|
|||
border-bottom: 1px solid $white-normal;
|
||||
|
||||
.timeline-entry-inner {
|
||||
padding-left: $gl-padding;
|
||||
padding-right: $gl-padding;
|
||||
border-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,20 +24,21 @@
|
|||
-# DiffNote
|
||||
= f.hidden_field :position
|
||||
|
||||
= render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do
|
||||
= render 'projects/zen', f: f,
|
||||
attr: :note,
|
||||
classes: 'note-textarea js-note-text',
|
||||
placeholder: "Write a comment or drag your files here...",
|
||||
supports_quick_actions: supports_quick_actions,
|
||||
supports_autocomplete: supports_autocomplete
|
||||
= render 'shared/notes/hints', supports_quick_actions: supports_quick_actions
|
||||
.error-alert
|
||||
.discussion-form-container
|
||||
= render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do
|
||||
= render 'projects/zen', f: f,
|
||||
attr: :note,
|
||||
classes: 'note-textarea js-note-text',
|
||||
placeholder: "Write a comment or drag your files here...",
|
||||
supports_quick_actions: supports_quick_actions,
|
||||
supports_autocomplete: supports_autocomplete
|
||||
= render 'shared/notes/hints', supports_quick_actions: supports_quick_actions
|
||||
.error-alert
|
||||
|
||||
.note-form-actions.clearfix
|
||||
= render partial: 'shared/notes/comment_button'
|
||||
.note-form-actions.clearfix
|
||||
= render partial: 'shared/notes/comment_button'
|
||||
|
||||
= yield(:note_actions)
|
||||
= yield(:note_actions)
|
||||
|
||||
%a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } }
|
||||
Discard draft
|
||||
%a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } }
|
||||
Discard draft
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
---
|
||||
title: Refactor and tweak margin for note forms on Issuable
|
||||
merge_request: 18120
|
||||
author: Takuya Noguchi
|
||||
type: fixed
|
Loading…
Reference in New Issue