Open platform to collect and prioritize feedback
Stop header from wrapping notification icons onto a new row
Matt Robertsb86e4e5546e8
diff --git a/public/components/Header.scss b/public/components/Header.scssindex 789caa731..f647c0e96 100644--- a/public/components/Header.scss+++ b/public/components/Header.scss@@ -1,11 +1,47 @@+@use "~@fider/assets/styles/variables.scss" as *;+#c-header {+ .c-header__row {+ display: flex;+ flex-wrap: wrap;+ align-items: center;+ gap: 0.5rem;+ width: 100%;+ }++ .c-header__brand {+ flex-basis: 100%;++ @include media("md") {+ flex-basis: auto;+ }+ }++ .c-header__nav {+ @include media("md") {+ margin-left: 0.5rem;+ }+ }++ .c-header__actions {+ margin-left: auto;+ }+.c-header__moderation {order: 99;flex-basis: 100%;- @media (min-width: 1024px) {+ @include media("xl") {order: 0;flex: 0 1 auto;+ flex-basis: auto;+ margin-left: auto;+ }+ }++ @include media("xl") {+ .c-header__actions {+ margin-left: 0;}}diff --git a/public/components/Header.tsx b/public/components/Header.tsxindex 5b351894c..70f1d5cb8 100644--- a/public/components/Header.tsx+++ b/public/components/Header.tsx@@ -39,28 +39,26 @@ export const Header = (props: HeaderProps) => {<RSSModal isOpen={isRSSModalOpen} onClose={hideRSSModal} url={`${fider.settings.baseURL}/feed/global.atom`} /><HStack className="c-menu p-4 w-full"><div className="container c-header__container">- <div className="flex flex-wrap flex-items-center justify-between gap-2 w-full">- <div className="flex flex-x flex-items-center flex-wrap gap-4">- <a href="/" className="flex flex-x flex-items-center flex--spacing-2 h-8">- <TenantLogo size={100} />- <h1 className="text-header">{fider.session.tenant.name}</h1>+ <div className="c-header__row">+ <a href="/" className="c-header__brand flex flex-x flex-items-center flex--spacing-2 h-8">+ <TenantLogo size={100} />+ <h1 className="text-header">{fider.session.tenant.name}</h1>+ </a>+ <HStack spacing={4} className="c-header__nav flex-items-center">+ <a href="/" className={`c-header__nav-link ${isFeedbackActive ? "c-header__nav-link--active" : ""}`}>+ <Trans id="header.nav.feedback">All Feedback</Trans></a>- <HStack spacing={4} className="flex-items-center ml-2">- <a href="/" className={`c-header__nav-link ${isFeedbackActive ? "c-header__nav-link--active" : ""}`}>- <Trans id="header.nav.feedback">All Feedback</Trans>- </a>- <a href="/roadmap" className={`c-header__nav-link ${isRoadmapActive ? "c-header__nav-link--active" : ""}`}>- <Trans id="header.nav.roadmap">Roadmap</Trans>- </a>- </HStack>- </div>+ <a href="/roadmap" className={`c-header__nav-link ${isRoadmapActive ? "c-header__nav-link--active" : ""}`}>+ <Trans id="header.nav.roadmap">Roadmap</Trans>+ </a>+ </HStack>{fider.session.isAuthenticated && (<div className="c-header__moderation"><ModerationIndicator /></div>)}{fider.session.isAuthenticated && (- <HStack spacing={2}>+ <HStack spacing={2} className="c-header__actions">{fider.session.tenant.isFeedEnabled && (<button title={atomFeedTitle} className="c-themeswitcher" onClick={showRSSModal}><Icon sprite={IconRss} className="h-6 text-gray-500" />@@ -72,7 +70,7 @@ export const Header = (props: HeaderProps) => {</HStack>)}{!fider.session.isAuthenticated && (- <HStack spacing={2}>+ <HStack spacing={2} className="c-header__actions">{fider.session.tenant.isFeedEnabled && (<button title={atomFeedTitle} className="c-themeswitcher" onClick={showRSSModal}><Icon sprite={IconRss} className="h-6 text-gray-500" />