Merge branch 'main' into production

Author: edan-bainglass

.github/workflows/deploy-to-aks.yml

@@ -55,6 +55,7 @@ jobs:
         PYTHON_VERSION: ${{ vars.PYTHON_VERSION }}
         CONTAINER_LIFETIME: ${{ vars.CONTAINER_LIFETIME }}
         INCLUDE_QE: ${{ vars.INCLUDE_QE }}
+        IS_MC_DEPLOYMENT: ${{ vars.IS_MC_DEPLOYMENT }}
         SUPPORT_EMAILS: ${{ vars.SUPPORT_EMAILS }}
 
     - name: Connect to AKS

basehub/files/etc/jupyterhub/templates/page.html

@@ -96,7 +96,7 @@
         {% endif %}
         <ul class="nav navbar-nav navbar-right">
           {% block nav_bar_right_items %}
-            <li>
+            <li id="login-widget">
               {% block login_widget %}
                 <span id="login_widget">
                   {% if user %}

basehub/files/static/external/css/page.css

@@ -13,6 +13,10 @@ body {
   background-color: white;
 }
 
+.navbar #login-widget {
+  margin-right: 16px;
+}
+
 .navbar #institution-logo a {
   padding: 6px;
 }
@@ -26,10 +30,10 @@ body {
   height: 28px;
 }
 
-#mc-link a {
+.navbar #mc-link a {
   padding: 6px;
 }
 
-#mc-link a img {
+.navbar #mc-link a img {
   height: 28px;
 }