diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/assets/javascripts/blob/components/blob_header.vue | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/blob/components/blob_header.vue')
-rw-r--r-- | app/assets/javascripts/blob/components/blob_header.vue | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/javascripts/blob/components/blob_header.vue b/app/assets/javascripts/blob/components/blob_header.vue index 4742b4ae4b4..933ad448c77 100644 --- a/app/assets/javascripts/blob/components/blob_header.vue +++ b/app/assets/javascripts/blob/components/blob_header.vue @@ -3,12 +3,14 @@ import DefaultActions from './blob_header_default_actions.vue'; import BlobFilepath from './blob_header_filepath.vue'; import ViewerSwitcher from './blob_header_viewer_switcher.vue'; import { SIMPLE_BLOB_VIEWER } from './constants'; +import TableOfContents from './table_contents.vue'; export default { components: { ViewerSwitcher, DefaultActions, BlobFilepath, + TableOfContents, }, props: { blob: { @@ -70,11 +72,14 @@ export default { </script> <template> <div class="js-file-title file-title-flex-parent"> - <blob-filepath :blob="blob"> - <template #filepath-prepend> - <slot name="prepend"></slot> - </template> - </blob-filepath> + <div class="gl-display-flex"> + <table-of-contents class="gl-pr-2" /> + <blob-filepath :blob="blob"> + <template #filepath-prepend> + <slot name="prepend"></slot> + </template> + </blob-filepath> + </div> <div class="gl-display-none gl-sm-display-flex"> <viewer-switcher v-if="showViewerSwitcher" v-model="viewer" /> |