@@ -76,7 +82,9 @@ function DefaultNavbar(props: DefaultNavbarMetadata) {
aria-expanded="false"
aria-label={t('main_navigation')}
>
-
+
) : null
})}
- {showAccountButtons &&
- (sessionUser ? (
-
- ) : (
-
- ))}
+ {sessionUser ? (
+
+ ) : (
+
+ )}
>
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx
index 17f29591f0..3b123c0afb 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx
@@ -14,8 +14,10 @@ export default function LoggedInItems({
const { t } = useTranslation()
return (
<>
-
{t('projects')}
-
+
+ {t('projects')}
+
+
{
sendMB('menu-clicked-register', { page: currentUrl })
}}
@@ -26,6 +26,7 @@ export default function LoggedOutItems({
) : null}
{
sendMB('menu-clicked-login', { page: currentUrl })
}}
diff --git a/services/web/frontend/js/features/ui/components/types/default-navbar-metadata.ts b/services/web/frontend/js/features/ui/components/types/default-navbar-metadata.ts
index b1d05cc771..e2970d85ec 100644
--- a/services/web/frontend/js/features/ui/components/types/default-navbar-metadata.ts
+++ b/services/web/frontend/js/features/ui/components/types/default-navbar-metadata.ts
@@ -13,7 +13,7 @@ export type DefaultNavbarMetadata = {
enableUpgradeButton: boolean
suppressNavbarRight: boolean
suppressNavContentLinks: boolean
- showAccountButtons?: boolean
+ showCloseIcon?: boolean
showSubscriptionLink: boolean
showSignUpLink: boolean
currentUrl: string
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss
index 8dfd20a866..7caad1a905 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss
@@ -15,8 +15,63 @@
.navbar-default {
position: relative;
- .navbar-header {
- padding-top: var(--spacing-08);
+ --navbar-toggler-expanded-bg: none;
+ --navbar-toggler-expanded-color: var(--content-secondary);
+
+ .navbar-header > a {
+ position: relative;
+ z-index: 15;
+
+ @include media-breakpoint-up(md) {
+ top: var(--spacing-05);
+ }
+ }
+
+ .nav-item-projects {
+ display: none !important;
+ }
+
+ @include media-breakpoint-up(lg) {
+ .nav-item-account,
+ .nav-item-help {
+ display: none;
+ }
+ }
+
+ @include media-breakpoint-down(lg) {
+ --navbar-hamburger-submenu-item-hover-color: var(--content-secondary);
+ --navbar-subdued-hover-color: var(--content-secondary);
+ --navbar-link-hover-color: var(--content-secondary);
+ --navbar-link-hover-bg: none;
+ --navbar-subdued-hover-bg: none;
+ --navbar-hamburger-submenu-bg: none;
+ --navbar-hamburger-submenu-item-hover-bg: none;
+
+ .nav-item-help::before {
+ content: '';
+ display: block;
+ border-top: 1px solid var(--border-divider);
+ margin: var(--spacing-07) var(--spacing-06);
+ }
+
+ #navbar-main-collapse {
+ padding: var(--spacing-09) var(--spacing-06) 0;
+
+ .navbar-nav {
+ > li {
+ > a,
+ > .dropdown-toggle,
+ > .nav-link {
+ border-radius: var(--border-radius-medium);
+
+ &.show {
+ background-color: var(--bg-accent-03);
+ color: var(--green-60);
+ }
+ }
+ }
+ }
+ }
}
}
@@ -32,6 +87,7 @@
flex: 0 0 15%;
max-width: 320px;
min-width: 200px;
+ margin-top: var(--spacing-03);
padding: var(--spacing-08) 0 0 0;
.new-project-dropdown {