Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/app/assets/javascripts/whats_new/components/app.vue b/app/assets/javascripts/whats_new/components/app.vue
index a439675d467..dd5d4edda59 100644
--- a/app/assets/javascripts/whats_new/components/app.vue
+++ b/app/assets/javascripts/whats_new/components/app.vue
@@ -2,6 +2,7 @@
 import { GlDrawer, GlInfiniteScroll, GlResizeObserverDirective } from '@gitlab/ui';
 import { mapState, mapActions } from 'vuex';
 import Tracking from '~/tracking';
+import { getContentWrapperHeight } from '~/lib/utils/dom_utils';
 import { getDrawerBodyHeight } from '../utils/get_drawer_body_height';
 import Feature from './feature.vue';
 import SkeletonLoader from './skeleton_loader.vue';
@@ -28,6 +29,9 @@ export default {
   },
   computed: {
     ...mapState(['open', 'features', 'pageInfo', 'drawerBodyHeight', 'fetching']),
+    getDrawerHeaderHeight() {
+      return getContentWrapperHeight();
+    },
   },
   mounted() {
     this.openDrawer(this.versionDigest);
@@ -69,6 +73,7 @@ export default {
       ref="drawer"
       v-gl-resize-observer="handleResize"
       class="whats-new-drawer gl-reset-line-height"
+      :header-height="getDrawerHeaderHeight"
       :z-index="700"
       :open="open"
       @close="closeDrawer"