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