diff --git a/services/web/frontend/js/features/project-list/components/project-list-root.tsx b/services/web/frontend/js/features/project-list/components/project-list-root.tsx index c23c545e5c..fa6ecd1abb 100644 --- a/services/web/frontend/js/features/project-list/components/project-list-root.tsx +++ b/services/web/frontend/js/features/project-list/components/project-list-root.tsx @@ -26,6 +26,8 @@ import { useEffect } from 'react' import withErrorBoundary from '../../../infrastructure/error-boundary' import { GenericErrorBoundaryFallback } from '../../../shared/components/generic-error-boundary-fallback' import { SplitTestProvider } from '@/shared/context/split-test-context' +import { bsVersion } from '@/features/utils/bootstrap-5' +import classnames from 'classnames' function ProjectListRoot() { const { isReady } = useWaitForI18n() @@ -79,7 +81,12 @@ function ProjectListPageContent() { <> -
+
{totalProjectsCount > 0 ? ( <> diff --git a/services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx b/services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx index 2a3f05038e..6ce451607d 100644 --- a/services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx +++ b/services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx @@ -3,6 +3,8 @@ import SidebarFilters from './sidebar-filters' import AddAffiliation, { useAddAffiliation } from '../add-affiliation' import SurveyWidget from '../survey-widget' import { usePersistedResize } from '../../../../shared/hooks/use-resize' +import { bsVersion } from '@/features/utils/bootstrap-5' +import classnames from 'classnames' function Sidebar() { const { show: showAddAffiliationWidget } = useAddAffiliation() @@ -12,7 +14,10 @@ function Sidebar() { return (
&.content { + padding-top: $header-height; + padding-bottom: 0; + min-height: calc(100vh - #{$header-height}); + display: flex; + flex-direction: column; + } + + .project-list-wrapper { + display: flex; + align-items: stretch; + width: 100%; + min-height: calc(100vh - #{$header-height}); + } + + .project-list-sidebar-wrapper-react { + position: relative; + background-color: var(--bg-dark-secondary); + flex: 0 0 15%; + min-height: calc(100vh - #{$header-height}); + max-width: 320px; + min-width: 200px; + + .project-list-sidebar-subwrapper { + display: flex; + flex-direction: column; + height: 100%; + + .project-list-sidebar-react { + flex-grow: 1; + padding-left: var(--spacing-06); + padding-right: var(--spacing-06); + -ms-overflow-style: -ms-autohiding-scrollbar; + padding-top: var(--spacing-08); + padding-bottom: var(--spacing-08); + color: var(--neutral-40); + + .small { + color: var(--neutral-40); + } + + button { + white-space: normal; + word-wrap: anywhere; + // prevents buttons from expanding sidebar width + } + + > .dropdown { + width: 100%; + + .new-project-button { + width: 100%; + } + } + } + } + } + + .project-list-main-react { + flex: 1; + overflow-x: hidden; + padding: var(--spacing-08) var(--spacing-06); + } +}