@@ -17,10 +17,6 @@ | |||
* along with this program; if not, write to the Free Software Foundation, | |||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |||
*/ | |||
.navbar-context-justified { | |||
display: flex; | |||
justify-content: space-between; | |||
} | |||
.navbar-context-branches { | |||
display: inline-flex; |
@@ -33,9 +33,11 @@ interface Props { | |||
export default function OrganizationNavigation({ organization, location }: Props) { | |||
return ( | |||
<ContextNavBar id="context-navigation" height={theme.contextNavHeightRaw}> | |||
<OrganizationNavigationHeaderContainer organization={organization} /> | |||
<OrganizationNavigationMeta organization={organization} /> | |||
<ContextNavBar height={theme.contextNavHeightRaw} id="context-navigation"> | |||
<div className="navbar-context-justified"> | |||
<OrganizationNavigationHeaderContainer organization={organization} /> | |||
<OrganizationNavigationMeta organization={organization} /> | |||
</div> | |||
<OrganizationNavigationMenu location={location} organization={organization} /> | |||
</ContextNavBar> | |||
); |
@@ -5,24 +5,28 @@ exports[`render 1`] = ` | |||
height={72} | |||
id="context-navigation" | |||
> | |||
<Connect(OrganizationNavigationHeader) | |||
organization={ | |||
Object { | |||
"key": "foo", | |||
"name": "Foo", | |||
"projectVisibility": "public", | |||
<div | |||
className="navbar-context-justified" | |||
> | |||
<Connect(OrganizationNavigationHeader) | |||
organization={ | |||
Object { | |||
"key": "foo", | |||
"name": "Foo", | |||
"projectVisibility": "public", | |||
} | |||
} | |||
} | |||
/> | |||
<Connect(OrganizationNavigationMeta) | |||
organization={ | |||
Object { | |||
"key": "foo", | |||
"name": "Foo", | |||
"projectVisibility": "public", | |||
/> | |||
<Connect(OrganizationNavigationMeta) | |||
organization={ | |||
Object { | |||
"key": "foo", | |||
"name": "Foo", | |||
"projectVisibility": "public", | |||
} | |||
} | |||
} | |||
/> | |||
/> | |||
</div> | |||
<OrganizationNavigationMenu | |||
location={ | |||
Object { |
@@ -32,6 +32,11 @@ | |||
border-bottom: none; | |||
} | |||
.navbar-context-justified { | |||
display: flex; | |||
justify-content: space-between; | |||
} | |||
/* use `min-width: 0` to cut breadcrumb links (to end with "...") */ | |||
/* https://stackoverflow.com/questions/38223879/white-space-nowrap-breaks-flexbox-layout */ | |||
.navbar-context-header { |