Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 1 deletions

diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue
index 4986c3780e5..d12478b42d8 100644
--- a/app/assets/javascripts/boards/components/board_form.vue
+++ b/app/assets/javascripts/boards/components/board_form.vue
@@ -178,6 +178,9 @@ export default {
   },
   methods: {
     ...mapActions(['setError', 'unsetError', 'setBoard']),
+    isFocusMode() {
+      return Boolean(document.querySelector('.content-wrapper > .js-focus-mode-board.is-focused'));
+    },
     cancel() {
       this.$emit('cancel');
     },
@@ -281,6 +284,7 @@ export default {
     modal-class="board-config-modal"
     content-class="gl-absolute gl-top-7"
     visible
+    :static="isFocusMode()"
     :hide-footer="readonly"
     :title="title"
     :action-primary="primaryProps"
diff --git a/app/assets/javascripts/boards/components/board_settings_sidebar.vue b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
index 58db2c9ac2a..89e13625210 100644
--- a/app/assets/javascripts/boards/components/board_settings_sidebar.vue
+++ b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
@@ -166,7 +166,7 @@ export default {
   <mounting-portal mount-to="#js-right-sidebar-portal" name="board-settings-sidebar" append>
     <gl-drawer
       v-bind="$attrs"
-      class="js-board-settings-sidebar gl-absolute boards-sidebar"
+      class="js-board-settings-sidebar boards-sidebar"
       :open="showSidebar"
       variant="sidebar"
       @close="unsetActiveListId"