From 81063da0844951bb0df49b252b45817f80bd78e0 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 27 May 2024 10:04:39 +0100
Subject: [PATCH 1/4] Fix menu styling on JupyterHub 5.0, require 5.0

---
 nebari_jupyterhub_theme/templates/page.html | 18 +++++++++---------
 pyproject.toml                              |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nebari_jupyterhub_theme/templates/page.html b/nebari_jupyterhub_theme/templates/page.html
index f6e6d1a..14e5e9c 100644
--- a/nebari_jupyterhub_theme/templates/page.html
+++ b/nebari_jupyterhub_theme/templates/page.html
@@ -6,16 +6,16 @@
 {% block nav_bar_left_items %}
 
 <!-- Default nav bar items -->
-<li><a href="{{base_url}}home {% if cdsdashboards_restricted %}-cds{% endif %}">Home</a></li>
-<li><a href="{{base_url}}token">Token</a></li>
+<li class="nav-item"><a class="nav-link" href="{{base_url}}home {% if cdsdashboards_restricted %}-cds{% endif %}">Home</a></li>
+<li class="nav-item"><a class="nav-link" href="{{base_url}}token">Token</a></li>
 
 <!-- Access to admin dashboard -->
 {% if user.admin %}
-<li><a href="{{base_url}}admin">Admin</a></li>
+<li class="nav-item"><a class="nav-link" href="{{base_url}}admin">Admin</a></li>
 {% endif %}
 
 {% if services %}
-<li class="dropdown">
+<li class="nav-item dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Services<span class="caret"></span></a>
     <ul class="dropdown-menu">
     {% for service in services %}
@@ -26,13 +26,13 @@
 {% endif %}
 
 <!-- Custom integrations-->
-<li><a href="/auth/admin/nebari/console/">User Management</a></li>
-<li><a href="/argo">Argo Workflows</a></li>
+<li class="nav-item"><a class="nav-link" href="/auth/admin/nebari/console/">User Management</a></li>
+<li class="nav-item"><a class="nav-link" href="/argo">Argo Workflows</a></li>
 {% if cdsdashboards_enabled %}
-    <li><a href="{{ base_url }}dashboards">Dashboards</a></li>
+    <li class="nav-item"><a class="nav-link" href="{{ base_url }}dashboards">Dashboards</a></li>
 {% endif %}
-<li><a href="/conda-store">Environment Management</a></li>
-<li><a href="/monitoring">Monitoring</a></li>
+<li class="nav-item"><a class="nav-link" href="/conda-store">Environment Management</a></li>
+<li class="nav-item"><a class="nav-link" href="/monitoring">Monitoring</a></li>
 
 {% endblock nav_bar_left_items %}
 
diff --git a/pyproject.toml b/pyproject.toml
index 4495c2f..509a928 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ classifiers = [
     "Topic :: Software Development :: Build Tools",
     "Operating System :: OS Independent",
 ]
-dependencies = ["jupyterhub"]
+dependencies = ["jupyterhub>=5.0.0"]
 
 [project.urls]
 "Bug Reports" = "https://github.com/nebari-dev/nebari-jupyterhub-theme/issues"

From a1f60573fbfa176c4266916ee784ee0cd9133efc Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 27 May 2024 17:02:07 +0100
Subject: [PATCH 2/4] =?UTF-8?q?Fix=20CSS=20for=20jhub=205:=20`.navbar-defa?=
 =?UTF-8?q?ult`=20=E2=86=92=20`.bg-body-tertiary`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and `.nav` → `.navbar-nav`
---
 nebari_jupyterhub_theme/templates/style.css | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nebari_jupyterhub_theme/templates/style.css b/nebari_jupyterhub_theme/templates/style.css
index 7dfd489..6cad657 100644
--- a/nebari_jupyterhub_theme/templates/style.css
+++ b/nebari_jupyterhub_theme/templates/style.css
@@ -95,18 +95,18 @@ a{
 }
 
 /* Navbar  */
-.nav{
+.navbar-nav {
     margin-left:10px;
 }
 
-.navbar.navbar-default {
+.navbar.bg-body-tertiary {
     background: var(--navbar-background-color);
     box-shadow: 0px 1.5px 3px 0px rgba(72, 74, 94, 0.16);
     border: None;
 }
 
-.navbar.navbar-default .navbar-nav>li>a,
-.navbar.navbar-default .navbar-text {
+.navbar.bg-body-tertiary .navbar-nav>li>a,
+.navbar.bg-body-tertiary .navbar-text {
     color: var(--navbar-text-color);
     text-decoration: none;
 }
@@ -125,8 +125,8 @@ a{
 
 /* Focus states */
 
-.navbar.navbar-default .navbar-nav>li>a:focus,
-.navbar.navbar-default .navbar-nav>.open>a:focus,
+.navbar.bg-body-tertiary .navbar-nav>li>a:focus,
+.navbar.bg-body-tertiary .navbar-nav>.open>a:focus,
 a:focus {
     color: var(--text-color);
     background-color: var(--accent-color);
@@ -192,14 +192,14 @@ a:hover{
     text-decoration-thickness: var(--text-decoration-thickness);
 }
 
-.navbar.navbar-default .navbar-nav>li>a:hover {
+.navbar.bg-body-tertiary .navbar-nav>li>a:hover {
     color: var(--text-color);
     background-color: var(--navbar-hover-color);
     text-decoration: underline;
 }
 
-.navbar.navbar-default .navbar-nav>.open>a,
-.navbar.navbar-default .navbar-nav>.open>a:hover{
+.navbar.bg-body-tertiary .navbar-nav>.open>a,
+.navbar.bg-body-tertiary .navbar-nav>.open>a:hover{
     background-color: {{ navbar_hover_color | default("#00a3b0") }};
 }
 

From c9f06c4071f2b3fbfef68fb625ddd37ede8c5c68 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 27 May 2024 17:29:51 +0100
Subject: [PATCH 3/4] Fix the login button visibility and spawner spacing

---
 nebari_jupyterhub_theme/templates/page.html | 18 ++++++++++++++++++
 nebari_jupyterhub_theme/templates/style.css |  7 +++++++
 2 files changed, 25 insertions(+)

diff --git a/nebari_jupyterhub_theme/templates/page.html b/nebari_jupyterhub_theme/templates/page.html
index 14e5e9c..8522032 100644
--- a/nebari_jupyterhub_theme/templates/page.html
+++ b/nebari_jupyterhub_theme/templates/page.html
@@ -36,6 +36,24 @@
 
 {% endblock nav_bar_left_items %}
 
+<!-- Switch login button to light -->
+{% block login_widget %}
+<span id="login_widget">
+  {% if user %}
+    <span class="navbar-text me-1">{{ user.name }}</span>
+    <a id="logout"
+       role="button"
+       class="btn btn-sm btn-outline-light"
+       href="{{ logout_url }}"> <i aria-hidden="true" class="fa fa-sign-out"></i> Logout</a>
+  {% else %}
+    <a id="login"
+       role="button"
+       class="btn btn-sm btn-outline-light"
+       href="{{ login_url }}">Login</a>
+  {% endif %}
+</span>
+{% endblock login_widget %}
+
 {% block footer %}
 {% if display_version %}
 <div class="version">
diff --git a/nebari_jupyterhub_theme/templates/style.css b/nebari_jupyterhub_theme/templates/style.css
index 6cad657..5829706 100644
--- a/nebari_jupyterhub_theme/templates/style.css
+++ b/nebari_jupyterhub_theme/templates/style.css
@@ -111,6 +111,13 @@ a{
     text-decoration: none;
 }
 
+/* Spawner form */
+
+#kubespawner-profiles-list > label.profile {
+  margin-bottom: 12px;
+  padding-bottom: 0;
+}
+
 /* Authenticator form */
 #login-main .auth-form-header {
     background: var(--accent-color) !important;

From 5e3006f8e45e71dfb979bc9a640fdec6b4741e70 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 27 May 2024 18:34:13 +0100
Subject: [PATCH 4/4] Important is needed because `bg-body-tertiary` has it

---
 nebari_jupyterhub_theme/templates/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nebari_jupyterhub_theme/templates/style.css b/nebari_jupyterhub_theme/templates/style.css
index 5829706..5ef5e4d 100644
--- a/nebari_jupyterhub_theme/templates/style.css
+++ b/nebari_jupyterhub_theme/templates/style.css
@@ -100,7 +100,7 @@ a{
 }
 
 .navbar.bg-body-tertiary {
-    background: var(--navbar-background-color);
+    background: var(--navbar-background-color)!important;
     box-shadow: 0px 1.5px 3px 0px rgba(72, 74, 94, 0.16);
     border: None;
 }