From 2f4c7ddd743192f500666220696c791a31fde8de Mon Sep 17 00:00:00 2001
From: Toshaan Bharvani <toshaan@vantosh.com>
Date: Wed, 9 Feb 2022 04:51:18 +0100
Subject: [PATCH] move uppermenu to the menu section of the navbar

Signed-off-by: Toshaan Bharvani <toshaan@vantosh.com>
---
 .../assets/css/header.scss                    |  3 +-
 .../layouts/partials/navbar.html              | 36 +++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/themes/openpowerfoundation/assets/css/header.scss b/themes/openpowerfoundation/assets/css/header.scss
index c240734..a26f27a 100644
--- a/themes/openpowerfoundation/assets/css/header.scss
+++ b/themes/openpowerfoundation/assets/css/header.scss
@@ -102,7 +102,8 @@ body {
 		}
 		&__uppermenu {
 			align-items: center;
-			line-height: 1.0;
+			line-height: 0.5;
+			margin-bottom: 0.25em;
 			li {
 				margin-left: 0.25em;
 				margin-right: 0.25em;
diff --git a/themes/openpowerfoundation/layouts/partials/navbar.html b/themes/openpowerfoundation/layouts/partials/navbar.html
index bd4c88c..968c677 100644
--- a/themes/openpowerfoundation/layouts/partials/navbar.html
+++ b/themes/openpowerfoundation/layouts/partials/navbar.html
@@ -8,7 +8,23 @@
 				<img src="{{ $imagefile.RelPermalink }}" width="297" height="49" alt="OpenPOWER">
 			</a>
 			<div class="header__menu-col col">
-				<div class="header__uppermenu">&nbsp;</div>
+				<div class="header__uppermenu d-flex flex-nowrap justify-content-center align-items-center">
+					<ul class="header__uppermenu d-lg-flex justify-content-end list-unstyled">
+					&nbsp;|&nbsp;
+					{{ range .Site.Menus.discuss }}
+						<li><a href="{{ .URL }}"><div class="tooltip-wrapper"><i class="{{ .Pre }}"></i><div class="tooltip-text">{{ .Name }}</div></div></a></li>
+					{{ end }}
+					&nbsp;|&nbsp;
+					{{ range .Site.Menus.code }}
+						<li><a href="{{ .URL }}"><div class="tooltip-wrapper"><i class="{{ .Pre }}"></i><div class="tooltip-text">{{ .Name }}</div></div></a></li>
+					{{ end }}
+					&nbsp;|&nbsp;
+					{{ range .Site.Menus.social }}
+						<li><a href="{{ .URL }}"><div class="tooltip-wrapper"><i class="{{ .Pre }}"></i><div class="tooltip-text">{{ .Name }}</div></div></a></li>
+					{{ end }}
+					&nbsp;|&nbsp;
+					</ul>
+				</div>
 				<div class="header__menu-col-row">
 					<nav class="navbar navbar-expand-lg header__menu-nav" id="nav-menu-container">
 					<ul class="nav-menu header__menu d-lg-flex justify-content-center list-unstyled">
@@ -73,23 +89,7 @@
 				</div>
 			</div>
 			<div class="header__contact-col">
-				<div class="header__contact-col-row col d-flex flex-nowrap justify-content-center align-items-center">
-					<ul class="header__uppermenu d-lg-flex justify-content-end list-unstyled">
-					&nbsp;|&nbsp;
-					{{ range .Site.Menus.discuss }}
-						<li><a href="{{ .URL }}"><div class="tooltip-wrapper"><i class="{{ .Pre }}"></i><div class="tooltip-text">{{ .Name }}</div></div></a></li>
-					{{ end }}
-					&nbsp;|&nbsp;
-					{{ range .Site.Menus.code }}
-						<li><a href="{{ .URL }}"><div class="tooltip-wrapper"><i class="{{ .Pre }}"></i><div class="tooltip-text">{{ .Name }}</div></div></a></li>
-					{{ end }}
-					&nbsp;|&nbsp;
-					{{ range .Site.Menus.social }}
-						<li><a href="{{ .URL }}"><div class="tooltip-wrapper"><i class="{{ .Pre }}"></i><div class="tooltip-text">{{ .Name }}</div></div></a></li>
-					{{ end }}
-					&nbsp;|&nbsp;
-					</ul>
-				</div>
+				<div class="header__contact-col-row col d-flex flex-nowrap justify-content-center align-items-center">&nbsp;</div>
 				<div class="header__contact-col-row col d-flex flex-nowrap justify-content-center align-items-center">
 					<div class="header__contact-btn join-us-button desktop-view">
 						<a class="d-block btn-outline-primary btn-sm btn" href="{{ "/join/" | relURL }}">Join</a>