From 0f30bc04db4187bc7f69543d4b2f82eccabb7cb8 Mon Sep 17 00:00:00 2001
From: Celeste Horgan <celeste@cncf.io>
Date: Thu, 2 Jul 2020 08:41:28 -0700
Subject: [PATCH 1/4] Fix display of dropdown on case studies

---
 assets/scss/_custom.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/scss/_custom.scss b/assets/scss/_custom.scss
index f02d6d908b..202c50393c 100644
--- a/assets/scss/_custom.scss
+++ b/assets/scss/_custom.scss
@@ -108,6 +108,10 @@ section {
 
       &.dropdown:hover {
         color: $medium-grey;
+
+        .dropdown-menu {
+          display: block;
+        }
       }
     }
   }
@@ -390,4 +394,4 @@ main.content {
       }
     }
   }
-}
+}
\ No newline at end of file

From 086e8a60f2ac87e4abe42deea1e054981c070751 Mon Sep 17 00:00:00 2001
From: Celeste Horgan <celeste@cncf.io>
Date: Tue, 7 Jul 2020 16:33:22 -0700
Subject: [PATCH 2/4] Use bootstrap right alignment

---
 assets/scss/_custom.scss                      | 12 ------------
 layouts/partials/navbar-lang-selector.html    | 10 ++++++++++
 layouts/partials/navbar-version-selector.html |  6 +++---
 3 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 layouts/partials/navbar-lang-selector.html

diff --git a/assets/scss/_custom.scss b/assets/scss/_custom.scss
index 202c50393c..1921e19067 100644
--- a/assets/scss/_custom.scss
+++ b/assets/scss/_custom.scss
@@ -101,18 +101,6 @@ section {
         left: 0;
         background: #fff;
       }
-
-      .dropdown-menu {
-        left: -80px;
-      }
-
-      &.dropdown:hover {
-        color: $medium-grey;
-
-        .dropdown-menu {
-          display: block;
-        }
-      }
     }
   }
 
diff --git a/layouts/partials/navbar-lang-selector.html b/layouts/partials/navbar-lang-selector.html
new file mode 100644
index 0000000000..7459c621c3
--- /dev/null
+++ b/layouts/partials/navbar-lang-selector.html
@@ -0,0 +1,10 @@
+{{/* Link directly to documentation etc., if possible. */}}
+{{ $langPage := cond (gt (len .Translations) 0) . .Site.Home }}
+<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+	{{ $langPage.Language.LanguageName }}
+</a>
+<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
+	{{ range $langPage.Translations }}
+	<a class="dropdown-item" href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
+	{{ end }}
+</div>
\ No newline at end of file
diff --git a/layouts/partials/navbar-version-selector.html b/layouts/partials/navbar-version-selector.html
index dfded2b553..5a3f03e126 100644
--- a/layouts/partials/navbar-version-selector.html
+++ b/layouts/partials/navbar-version-selector.html
@@ -1,8 +1,8 @@
 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-  {{ T "version_menu" }}
+	{{ .Site.Params.version_menu }}
 </a>
-<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
 	{{ range .Site.Params.versions }}
 	<a class="dropdown-item" href="{{ .url }}">{{ .version }}</a>
 	{{ end }}
-</div>
+</div>
\ No newline at end of file

From f9e2439e56e078bbdbdca97cf44eec2b6057c25d Mon Sep 17 00:00:00 2001
From: Celeste Horgan <celeste@cncf.io>
Date: Tue, 7 Jul 2020 17:42:51 -0700
Subject: [PATCH 3/4] Include scripts.html in case studies template

---
 layouts/case-studies/single-baseof.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layouts/case-studies/single-baseof.html b/layouts/case-studies/single-baseof.html
index e97cbf934d..64b48a4e13 100644
--- a/layouts/case-studies/single-baseof.html
+++ b/layouts/case-studies/single-baseof.html
@@ -9,5 +9,7 @@
 		{{ partialCached "footer.html" . }}
 		<!-- Disabling this as elements queries do not appear to exist on case studies -->
 		<!-- {{ partialCached "footer-scripts.html" . }} -->
+    {{ partialCached "scripts.html" . }}
+
 	</body>
 </html>
\ No newline at end of file

From 37b1f94fe49a4956e05ae42fe1d50bf0f9fffb9f Mon Sep 17 00:00:00 2001
From: Celeste Horgan <celeste@cncf.io>
Date: Wed, 8 Jul 2020 09:48:16 -0700
Subject: [PATCH 4/4] Revert T "version_menu"

---
 layouts/partials/navbar-version-selector.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/navbar-version-selector.html b/layouts/partials/navbar-version-selector.html
index 5a3f03e126..09e872053f 100644
--- a/layouts/partials/navbar-version-selector.html
+++ b/layouts/partials/navbar-version-selector.html
@@ -1,5 +1,5 @@
 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-	{{ .Site.Params.version_menu }}
+	{{ T "version_menu" }}
 </a>
 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
 	{{ range .Site.Params.versions }}