Commit 21530b55 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

Merge branch '58789-some-system-notes-on-issuable-are-folded-on-mobile' into 'master'

Keep inline as much as possible in system notes on issuable

Closes #58789

See merge request gitlab-org/gitlab-ce!25968
parents 3300143b 0ef80ccc
...@@ -87,27 +87,25 @@ export default { ...@@ -87,27 +87,25 @@ export default {
<span class="note-headline-light">@{{ author.username }}</span> <span class="note-headline-light">@{{ author.username }}</span>
</a> </a>
<span v-else>{{ __('A deleted user') }}</span> <span v-else>{{ __('A deleted user') }}</span>
<span class="note-headline-light"> <span class="note-headline-light note-headline-meta">
<span class="note-headline-meta"> <span class="system-note-message"> <slot></slot> </span>
<span class="system-note-message"> <slot></slot> </span> <template v-if="createdAt">
<template v-if="createdAt"> <span class="system-note-separator">
<span class="system-note-separator"> <template v-if="actionText">{{ actionText }}</template>
<template v-if="actionText">{{ actionText }}</template> </span>
</span> <a
<a :href="noteTimestampLink"
:href="noteTimestampLink" class="note-timestamp system-note-separator"
class="note-timestamp system-note-separator" @click="updateTargetNoteHash"
@click="updateTargetNoteHash" >
> <time-ago-tooltip :time="createdAt" tooltip-placement="bottom" />
<time-ago-tooltip :time="createdAt" tooltip-placement="bottom" /> </a>
</a> </template>
</template> <i
<i class="fa fa-spinner fa-spin editing-spinner"
class="fa fa-spinner fa-spin editing-spinner" aria-label="Comment is being updated"
aria-label="Comment is being updated" aria-hidden="true"
aria-hidden="true" ></i>
></i>
</span>
</span> </span>
</div> </div>
</template> </template>
...@@ -283,8 +283,6 @@ $note-form-margin-left: 72px; ...@@ -283,8 +283,6 @@ $note-form-margin-left: 72px;
} }
.system-note-message { .system-note-message {
display: inline;
&::first-letter { &::first-letter {
text-transform: lowercase; text-transform: lowercase;
} }
...@@ -607,12 +605,6 @@ $note-form-margin-left: 72px; ...@@ -607,12 +605,6 @@ $note-form-margin-left: 72px;
} }
.note-headline-meta { .note-headline-meta {
display: inline-block;
.system-note-message {
white-space: normal;
}
.system-note-separator { .system-note-separator {
color: $gl-text-color-disabled; color: $gl-text-color-disabled;
} }
......
...@@ -36,14 +36,13 @@ ...@@ -36,14 +36,13 @@
= user_status(note.author) = user_status(note.author)
%span.note-headline-light %span.note-headline-light
= note.author.to_reference = note.author.to_reference
%span.note-headline-light %span.note-headline-light.note-headline-meta
%span.note-headline-meta - if note.system
- if note.system %span.system-note-message
%span.system-note-message = markdown_field(note, :note)
= markdown_field(note, :note) %span.system-note-separator
%span.system-note-separator &middot;
&middot; %a.system-note-separator{ href: "##{dom_id(note)}" }= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
%a.system-note-separator{ href: "##{dom_id(note)}" }= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
- unless note.system? - unless note.system?
.note-actions .note-actions
- if note.for_personal_snippet? - if note.for_personal_snippet?
......
---
title: Keep inline as much as possible in system notes on issuable
merge_request: 25968
author: Takuya Noguchi
type: fixed
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment