Remove unresolved class and fixed height in discussion header
This commit is contained in:
parent
1e9dd17618
commit
1897ec48d3
|
@ -144,15 +144,6 @@ export default {
|
|||
|
||||
return {};
|
||||
},
|
||||
componentClassName() {
|
||||
if (this.shouldRenderDiffs) {
|
||||
if (!this.lastUpdatedAt && !this.discussion.resolved) {
|
||||
return 'unresolved';
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
},
|
||||
isExpanded() {
|
||||
return this.discussion.expanded || this.alwaysExpanded;
|
||||
},
|
||||
|
@ -313,11 +304,11 @@ export default {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<timeline-entry-item class="note note-discussion" :class="componentClassName">
|
||||
<timeline-entry-item class="note note-discussion">
|
||||
<div class="timeline-content">
|
||||
<div :data-discussion-id="discussion.id" class="discussion js-discussion-container">
|
||||
<div v-if="shouldRenderDiffs" class="discussion-header note-wrapper">
|
||||
<div v-once class="timeline-icon">
|
||||
<div v-once class="timeline-icon align-self-start flex-shrink-0">
|
||||
<user-avatar-link
|
||||
v-if="author"
|
||||
:link-href="author.path"
|
||||
|
@ -326,7 +317,7 @@ export default {
|
|||
:img-size="40"
|
||||
/>
|
||||
</div>
|
||||
<div class="timeline-content">
|
||||
<div class="timeline-content w-100">
|
||||
<note-header
|
||||
:author="author"
|
||||
:created-at="firstNote.created_at"
|
||||
|
|
|
@ -598,7 +598,8 @@ $note-form-margin-left: 72px;
|
|||
}
|
||||
|
||||
.discussion-header {
|
||||
min-height: 74px;
|
||||
min-height: $line-height-base * 2em;
|
||||
box-sizing: content-box;
|
||||
|
||||
.note-header-info {
|
||||
padding-bottom: 0;
|
||||
|
@ -608,13 +609,10 @@ $note-form-margin-left: 72px;
|
|||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
.unresolved {
|
||||
.discussion-header {
|
||||
.note-header-info {
|
||||
margin-top: $gl-padding-8;
|
||||
}
|
||||
&.note-wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove unresolved class and fixed height in discussion header
|
||||
merge_request: 28440
|
||||
author: David Palubin
|
||||
type: other
|
Loading…
Reference in New Issue