Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
61af16df
Commit
61af16df
authored
Jan 20, 2021
by
jerasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix reply box on diffs
Fixed the border for reply box
parent
1d7c653b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue
...pts/notes/components/discussion_notes_replies_wrapper.vue
+8
-3
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+1
-1
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-1
changelogs/unreleased/285507-fix-reply-box-border.yml
changelogs/unreleased/285507-fix-reply-box-border.yml
+5
-0
No files found.
app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue
View file @
61af16df
...
...
@@ -16,9 +16,14 @@ export default {
},
render
(
h
,
{
props
,
children
})
{
if
(
props
.
isDiffDiscussion
)
{
return
h
(
'
li
'
,
{
class
:
'
discussion-collapsible bordered-box clearfix
'
},
[
h
(
'
ul
'
,
{
class
:
'
notes
'
},
children
),
]);
return
h
(
'
li
'
,
{
class
:
'
discussion-collapsible gl-border-solid gl-border-gray-100 gl-border-1 gl-rounded-base gl-overflow-hidden clearfix
'
,
},
[
h
(
'
ul
'
,
{
class
:
'
notes
'
},
children
)],
);
}
return
children
;
...
...
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
61af16df
...
...
@@ -265,7 +265,7 @@ export default {
<div
v-else-if=
"showReplies"
:class=
"
{ 'is-replying': isReplying }"
class="discussion-reply-holder clearfix"
class="discussion-reply-holder
gl-border-t-0!
clearfix"
>
<user-avatar-link
v-if=
"!isReplying && userCanReply"
...
...
app/assets/stylesheets/pages/notes.scss
View file @
61af16df
...
...
@@ -159,7 +159,6 @@ $note-form-margin-left: 72px;
>
li
{
display
:
block
;
position
:
relative
;
border-bottom
:
0
;
&
.being-posted
{
pointer-events
:
none
;
...
...
changelogs/unreleased/285507-fix-reply-box-border.yml
0 → 100644
View file @
61af16df
---
title
:
Fix reply box border on diffs
merge_request
:
52084
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment