diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/notes/components/note_edited_text.vue
index 29fa6a0dc7319abcd5e7968bc6d9b88355846eb4..14f9f31189b712e150a91e3eb04d09234d9ed96c 100644
--- a/app/assets/javascripts/notes/components/note_edited_text.vue
+++ b/app/assets/javascripts/notes/components/note_edited_text.vue
@@ -56,7 +56,7 @@ export default {
<gl-link
:href="editedBy.path"
:data-user-id="editedBy.id"
- class="js-user-link author-link hover:gl-underline"
+ class="js-user-link author-link gl-text-default hover:gl-underline"
>
{{ editedBy.name }}
</gl-link>
diff --git a/app/assets/javascripts/notes/components/notes_activity_header.vue b/app/assets/javascripts/notes/components/notes_activity_header.vue
index 5758a0834c2041cbdae9a9724e156ce9a76fc9fe..13d81ae8cc14f5b5967f0e815cf2dcddc7d61d99 100644
--- a/app/assets/javascripts/notes/components/notes_activity_header.vue
+++ b/app/assets/javascripts/notes/components/notes_activity_header.vue
@@ -53,7 +53,7 @@ export default {
<div
class="gl-flex gl-flex-col gl-justify-between gl-pb-3 gl-pt-5 sm:gl-flex-row sm:gl-items-center"
>
- <h2 class="gl-m-0 gl-text-size-h1">{{ __('Activity') }}</h2>
+ <h2 class="gl-heading-2 gl-m-0">{{ __('Activity') }}</h2>
<div class="gl-mt-3 gl-flex gl-w-full gl-gap-3 sm:gl-mt-0 sm:gl-w-auto">
<ai-summarize-notes
v-if="showAiActions"
diff --git a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_body.vue b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_body.vue
index 691224e9fe4d360ce0c16a3fa9963e8439e50374..37b2e747d0f0e591b13492b668f5a53c2a2f07b5 100644
--- a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_body.vue
+++ b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_body.vue
@@ -100,8 +100,9 @@ export default {
<note-edited-text
v-if="edited"
:edited-at="updatedNote.lastEditedAt"
+ :edited-by="updatedNote.lastEditedBy"
:action-text="editedText"
- class-name="gl-text-subtle gl-text-sm gl-display-block gl-mt-4"
+ class-name="gl-text-subtle gl-text-sm gl-display-block gl-mt-5"
/>
</template>
diff --git a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_header.vue b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_header.vue
index 6b271cd588167ecd984c45b324ec1f9885e8e994..afe838964f33a4cf6fe152d3bb40a5bd3b9f7c53 100644
--- a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_header.vue
+++ b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/note_header.vue
@@ -131,6 +131,7 @@ export default {
</template>
<span v-else>{{ __('A deleted user') }}</span>
<span class="note-headline-light note-healine-meta">
+ <span class="gl-hidden sm:gl-inline">·</span>
<template v-if="createdAt">
<time-ago-tooltip ref="noteTimestamp" :time="createdAt" tooltip-placement="bottom" />
</template>
diff --git a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_discussion.vue b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_discussion.vue
index 97c86a120c2a6a13e4584e07bcd5948384831064..01bf233c6048a931f24bbe5131ca2fd41bc35e3c 100644
--- a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_discussion.vue
+++ b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_discussion.vue
@@ -128,7 +128,7 @@ export default {
<template v-if="replies.length || isReplying" #note-footer>
<div
data-testid="wiki-note-footer"
- class="gl-border-t-1 gl-border-t-[#dcdcde] gl-bg-subtle gl-border-t-solid"
+ class="gl-border-t gl-rounded-b-base gl-border-t-subtle gl-bg-subtle dark:gl-border-t-section"
>
<toggle-replies-widget
v-if="replies.length"
@@ -139,7 +139,7 @@ export default {
<div
v-if="!collapsed"
- class="note-footer discussion-reply-holder clearfix gl-px-5 gl-py-4"
+ class="note-footer discussion-reply-holder clearfix gl-px-5 gl-pb-4 gl-pt-2"
>
<div v-for="reply in replies" :key="reply.id">
<wiki-note
diff --git a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_note.vue b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_note.vue
index a17bba4d9fe2e60a7999044da1e9eca30ff0822c..93eac0c3fd4a5f098e72e853309f377b99b8bc6e 100644
--- a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_note.vue
+++ b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_note.vue
@@ -110,9 +110,9 @@ export default {
'internal-note': this.note.internal,
},
noteParent: {
- card: !this.replyNote,
+ 'gl-rounded-base gl-border gl-border-section': !this.replyNote,
'gl-ml-7': this.replyNote,
- 'gl-ml-8': !this.replyNote,
+ 'gl-bg-section gl-ml-8': !this.replyNote,
},
};
},
@@ -286,6 +286,7 @@ export default {
<span class="gl-hidden sm:gl-inline">·</span>
</note-header>
<note-actions
+ :class="{ '-gl-mr-5': replyNote }"
:author-id="authorId"
:show-edit="canEdit"
:show-reply="canReply"
@@ -325,7 +326,7 @@ export default {
/>
</div>
- <slot name="note-footer"> </slot>
+ <slot name="note-footer"></slot>
</div>
</timeline-entry-item>
</template>
diff --git a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_notes_activity_header.vue b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_notes_activity_header.vue
index e2f2594143c486012665928ec507a75698e755fa..e077483508fe1405bebed288be7f27e30ae87db8 100644
--- a/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_notes_activity_header.vue
+++ b/app/assets/javascripts/pages/shared/wikis/wiki_notes/components/wiki_notes_activity_header.vue
@@ -9,9 +9,7 @@ export default {
};
</script>
<template>
- <div
- class="gl-flex gl-flex-col gl-justify-between gl-pb-3 gl-pt-5 sm:gl-flex-row sm:gl-items-center"
- >
- <h2 class="gl-m-0 gl-text-size-h1">{{ $options.i18n.headerText }}</h2>
+ <div class="gl-flex gl-flex-col gl-justify-between gl-pt-5 sm:gl-flex-row sm:gl-items-center">
+ <h2 class="gl-heading-2 gl-mb-0 gl-mt-5">{{ $options.i18n.headerText }}</h2>
</div>
</template>
diff --git a/app/assets/javascripts/wikis/graphql/notes/wiki_page_note.fragment.graphql b/app/assets/javascripts/wikis/graphql/notes/wiki_page_note.fragment.graphql
index e6cb7b3511238c7215e7ef8a0ded36c578db6b0d..9758d60e9dd34ec2eafd3d94ca833a814047c05e 100644
--- a/app/assets/javascripts/wikis/graphql/notes/wiki_page_note.fragment.graphql
+++ b/app/assets/javascripts/wikis/graphql/notes/wiki_page_note.fragment.graphql
@@ -9,6 +9,9 @@ fragment WikiPageNote on Note {
bodyHtml
createdAt
lastEditedAt
+ lastEditedBy {
+ ...Author
+ }
url
awardEmoji {
nodes {
diff --git a/spec/frontend/pages/shared/wikis/notes/components/wiki_notes_app_spec.js b/spec/frontend/pages/shared/wikis/notes/components/wiki_notes_app_spec.js
index 31c051fb5bbe909ff8bfecb92cfdc37c7d842e0f..4a62941c6b82bc92ed85ab5ee325ca0973303d49 100644
--- a/spec/frontend/pages/shared/wikis/notes/components/wiki_notes_app_spec.js
+++ b/spec/frontend/pages/shared/wikis/notes/components/wiki_notes_app_spec.js
@@ -37,6 +37,7 @@ const mockDiscussion = (...children) => {
bodyHtml: c,
createdAt: '2023-05-18T14:24:07.000+00:00',
lastEditedAt: null,
+ lastEditedBy: null,
url: 'https://path/to/2/',
awardEmoji: null,
userPermissions: {