Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/boards/components/board_content.vue b/app/assets/javascripts/boards/components/board_content.vue
index 150378f7a7d..5bc6ce105b9 100644
--- a/app/assets/javascripts/boards/components/board_content.vue
+++ b/app/assets/javascripts/boards/components/board_content.vue
@@ -1,8 +1,10 @@
 <script>
 import { GlAlert } from '@gitlab/ui';
+import { breakpoints } from '@gitlab/ui/dist/utils';
 import { sortBy, throttle } from 'lodash';
 import Draggable from 'vuedraggable';
 import { mapState, mapGetters, mapActions } from 'vuex';
+import { contentTop } from '~/lib/utils/common_utils';
 import { s__ } from '~/locale';
 import { formatBoardLists } from 'ee_else_ce/boards/boards_util';
 import BoardAddNewColumn from 'ee_else_ce/boards/components/board_add_new_column.vue';
@@ -142,7 +144,11 @@ export default {
       el.scrollTo({ left: el.scrollWidth, behavior: 'smooth' });
     },
     setBoardHeight() {
-      this.boardHeight = `${window.innerHeight - this.$el.getBoundingClientRect().top}px`;
+      if (window.innerWidth < breakpoints.md) {
+        this.boardHeight = `${window.innerHeight - contentTop()}px`;
+      } else {
+        this.boardHeight = `${window.innerHeight - this.$el.getBoundingClientRect().top}px`;
+      }
     },
   },
 };