diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 00:08:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 00:08:53 +0300 |
commit | 269e52662aceba62b91424e87f4def90ecc81e6c (patch) | |
tree | 6ba6a0ce47114c969ce92e7e726ee303013bebcf /app/assets/javascripts | |
parent | bbc241ab7fff1f6854a70eb56ee70b0dad2b6144 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
3 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/performance_bar/index.js b/app/assets/javascripts/performance_bar/index.js index 7d4b582f681..e3e48e61393 100644 --- a/app/assets/javascripts/performance_bar/index.js +++ b/app/assets/javascripts/performance_bar/index.js @@ -34,7 +34,6 @@ const initPerformanceBar = (el) => { requestId: performanceBarData.requestId, requestMethod: performanceBarData.requestMethod, peekUrl: performanceBarData.peekUrl, - profileUrl: performanceBarData.profileUrl, statsUrl: performanceBarData.statsUrl, }; }, @@ -154,7 +153,6 @@ const initPerformanceBar = (el) => { requestId: this.requestId, requestMethod: this.requestMethod, peekUrl: this.peekUrl, - profileUrl: this.profileUrl, statsUrl: this.statsUrl, }, on: { diff --git a/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue b/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue index 26309a25f07..08e52442311 100644 --- a/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue +++ b/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue @@ -20,7 +20,9 @@ export default { }; </script> <template> - <div class="container gl-display-flex gl-flex-direction-column"> + <div + class="gl-display-flex gl-flex-direction-column gl-mt-4 gl-border-t-1 gl-border-t-gray-100 gl-border-t-solid" + > <h2 class="gl-my-7 gl-font-size-h1 gl-text-center"> {{ title }} </h2> diff --git a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue index 98df4d290ae..31fd9e0a0ec 100644 --- a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue +++ b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue @@ -130,7 +130,7 @@ export default { <template> <credit-card-verification v-if="shouldVerify" @verified="onVerified" /> - <div v-else-if="!activePanelName"> + <div v-else-if="!activePanelName" class="gl-mt-4"> <gl-breadcrumb :items="breadcrumbs" data-testid="breadcrumb-links" /> <welcome-page :panels="panels" :title="title"> <template #footer> @@ -138,9 +138,11 @@ export default { </template> </welcome-page> </div> - <div v-else> + <div v-else class="gl-pt-4"> <gl-breadcrumb :items="breadcrumbs" data-testid="breadcrumb-links" /> - <div class="gl-display-flex gl-py-5 gl-align-items-center"> + <div + class="gl-display-flex gl-align-items-center gl-mt-4 gl-py-5 gl-border-t-1 gl-border-t-gray-100 gl-border-t-solid" + > <div v-safe-html="activePanel.illustration" class="gl-text-white col-auto"></div> <div class="col"> <h4>{{ activePanel.title }}</h4> |