diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-05 09:14:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-05 09:14:27 +0300 |
commit | 309dbdc49533a76243003a3f662736ae0b0ec14a (patch) | |
tree | b42d671d3cf72336014d3545c872f3068d5bde97 /app/assets | |
parent | 77f4cd207cb3a831ffa36d67377e28030622a4a8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
4 files changed, 15 insertions, 9 deletions
diff --git a/app/assets/javascripts/entrypoints/analytics.js b/app/assets/javascripts/entrypoints/analytics.js index e18c4bc8742..f5c61d82f64 100644 --- a/app/assets/javascripts/entrypoints/analytics.js +++ b/app/assets/javascripts/entrypoints/analytics.js @@ -13,6 +13,10 @@ if (appId && host) { performanceTiming: false, errorTracking: false, }, + pagePingTracking: { + minimumVisitLength: 10, + heartbeatDelay: 10, + }, }); const userId = window.gl?.snowplowStandardContext?.data?.user_id; diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/details_header.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/details_header.vue index 75af0286e12..7fd7c0fe542 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/details_header.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/details_header.vue @@ -142,7 +142,12 @@ export default { </template> <template v-if="formattedSize" #metadata-size> - <metadata-item icon="disk" :text="formattedSize" data-testid="image-size" /> + <metadata-item + icon="disk" + :text="formattedSize" + :text-tooltip="s__('ContainerRegistry|Includes both tagged and untagged images')" + data-testid="image-size" + /> </template> <template #metadata-cleanup> diff --git a/app/assets/stylesheets/framework/top_bar.scss b/app/assets/stylesheets/framework/top_bar.scss index 424d4269c52..d4b36b82584 100644 --- a/app/assets/stylesheets/framework/top_bar.scss +++ b/app/assets/stylesheets/framework/top_bar.scss @@ -5,14 +5,16 @@ .top-bar-fixed { @include gl-inset-border-b-1-gray-100; background-color: $body-bg; - left: var(--application-bar-left); position: fixed; + left: var(--application-bar-left); right: var(--application-bar-right); top: $calc-application-bars-height; - width: auto; + width: calc(100% - var(--application-bar-left)); z-index: $top-bar-z-index; @media (prefers-reduced-motion: no-preference) { - transition: left $gl-transition-duration-medium, right $gl-transition-duration-medium; + transition: left $gl-transition-duration-medium, + right $gl-transition-duration-medium, + width $gl-transition-duration-medium; } } diff --git a/app/assets/stylesheets/page_bundles/issuable.scss b/app/assets/stylesheets/page_bundles/issuable.scss index 8b353b42f58..05563f8e314 100644 --- a/app/assets/stylesheets/page_bundles/issuable.scss +++ b/app/assets/stylesheets/page_bundles/issuable.scss @@ -105,8 +105,3 @@ @include gl-font-weight-normal; } } - -[data-page="projects:issues:show"] .top-bar-fixed, -[data-page="groups:epics:show"] .top-bar-fixed { - width: 100%; -} |