2 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_shared/components/gl_modal.vue b/app/assets/javascripts/vue_shared/components/gl_modal.vue
index b298b989203..416eda796a7 100644
--- a/app/assets/javascripts/vue_shared/components/gl_modal.vue
+++ b/app/assets/javascripts/vue_shared/components/gl_modal.vue
@@ -45,6 +45,11 @@ export default {
     emitSubmit(event) {
       this.$emit('submit', event);
     },
+    opened({ propertyName }) {
+      if (propertyName === 'opacity') {
+        this.$emit('open');
+      }
+    },
   },
 };
 </script>
@@ -55,6 +60,7 @@ export default {
     class="modal fade"
     tabindex="-1"
     role="dialog"
+    @transitionend="opened"
   >
     <div
       :class="modalSizeClass"
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue b/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
index 80dc7d3557c..ac2e99abe77 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
@@ -12,11 +12,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    cssClasses: {
-      type: String,
-      required: false,
-      default: '',
-    },
   },
   computed: {
     tooltipLabel() {
@@ -35,12 +30,10 @@ export default {
   <button
     v-tooltip
     :title="tooltipLabel"
-    :class="cssClasses"
     type="button"
     class="btn btn-blank gutter-toggle btn-sidebar-action"
     data-container="body"
     data-placement="left"
-    data-boundary="viewport"
     @click="toggle"
   >
     <i