Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 8 deletions

diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
index 90ee4351e39..b026e2d57e2 100644
--- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
@@ -57,11 +57,13 @@ export default {
     </div>
     <div class="timeline-event-note timeline-event-border" data-testid="event-text-container">
       <div class="gl-display-flex gl-align-items-center gl-mb-3">
-        <strong class="gl-font-lg" data-testid="event-time">
+        <h3 class="gl-font-weight-bold gl-font-sm gl-my-0" data-testid="event-time">
           <gl-sprintf :message="$options.i18n.timeUTC">
-            <template #time>{{ time }}</template>
+            <template #time>
+              <span class="gl-font-lg">{{ time }}</span>
+            </template>
           </gl-sprintf>
-        </strong>
+        </h3>
         <gl-badge v-if="eventTag" variant="muted" icon="tag" class="gl-ml-3">
           {{ eventTag }}
         </gl-badge>
diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue
index c6b93201c97..88d14c007bc 100644
--- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue
@@ -132,17 +132,21 @@ export default {
 </script>
 
 <template>
-  <div class="issuable-discussion incident-timeline-events">
+  <div class="issuable-discussion incident-timeline-events gl-mt-n3">
     <div
       v-for="[eventDate, events] in dateGroupedEvents"
       :key="eventDate"
       data-testid="timeline-group"
       class="timeline-group"
     >
-      <div class="gl-pb-3 gl-border-gray-50 gl-border-1 gl-border-b-solid">
-        <strong class="gl-font-size-h2" data-testid="event-date">{{ eventDate }}</strong>
-      </div>
-      <ul class="notes main-notes-list">
+      <h2
+        class="gl-font-size-h2 gl-my-0 gl-py-5 gl-border-gray-50 gl-border-1 gl-border-b-solid"
+        data-testid="event-date"
+      >
+        {{ eventDate }}
+      </h2>
+
+      <ul class="notes main-notes-list gl-pt-2!">
         <li
           v-for="(event, eventIndex) in events"
           :key="eventIndex"