kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '55206-discussion-text-alignment' into 'master'

Browse source 
Correctly align resolved discussion text

Closes #55206

See merge request gitlab-org/gitlab-ce!25001
This commit is contained in:
Annabel Dunstone Gray 2019-02-15 12:36:11 +00:00
commit a017fe6e3f
2 changed files with 35 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/assets/javascripts/notes/components/noteable_discussion.vue
View file

@ -363,30 +363,32 @@ Please check your network connection and try again.`;
:img-size="40"
/>
</div>
<note-header
:author="author"
:created-at="initialDiscussion.created_at"
:note-id="initialDiscussion.id"
:include-toggle="true"
:expanded="discussion.expanded"
@toggleHandler="toggleDiscussionHandler"
>
<span v-html="actionText"></span>
</note-header>
<note-edited-text
v-if="discussion.resolved"
:edited-at="discussion.resolved_at"
:edited-by="discussion.resolved_by"
:action-text="resolvedText"
class-name="discussion-headline-light js-discussion-headline"
/>
<note-edited-text
v-else-if="lastUpdatedAt"
:edited-at="lastUpdatedAt"
:edited-by="lastUpdatedBy"
action-text="Last updated"
class-name="discussion-headline-light js-discussion-headline"
/>
<div class="timeline-content">
<note-header
:author="author"
:created-at="initialDiscussion.created_at"
:note-id="initialDiscussion.id"
:include-toggle="true"
:expanded="discussion.expanded"
@toggleHandler="toggleDiscussionHandler"
>
<span v-html="actionText"></span>
</note-header>
<note-edited-text
v-if="discussion.resolved"
:edited-at="discussion.resolved_at"
:edited-by="discussion.resolved_by"
:action-text="resolvedText"
class-name="discussion-headline-light js-discussion-headline"
/>
<note-edited-text
v-else-if="lastUpdatedAt"
:edited-at="lastUpdatedAt"
:edited-by="lastUpdatedBy"
action-text="Last updated"
class-name="discussion-headline-light js-discussion-headline"
/>
</div>
</div>
<div v-if="shouldShowDiscussions" class="discussion-body">
<component

10
app/assets/stylesheets/pages/notes.scss
View file

@ -550,6 +550,11 @@ $note-form-margin-left: 72px;
.note-header-info {
padding-bottom: 0;
}
.timeline-content {
overflow-x: auto;
overflow-y: hidden;
}
}
.unresolved {
@ -597,7 +602,6 @@ $note-form-margin-left: 72px;
.note-headline-meta {
display: inline-block;
white-space: nowrap;
.system-note-message {
white-space: normal;
@ -607,6 +611,10 @@ $note-form-margin-left: 72px;
color: $gl-text-color-disabled;
}
.note-timestamp {
white-space: nowrap;
}
a:hover {
text-decoration: underline;
}