Merge branch 'master' of https://github.com/ImagingDataCommons/IDC-WebApp into idc-test

s-paquette · s-paquette · commit 0c352670f052 · 2025-03-31T08:20:02.000-07:00
diff --git a/static/css/style.css b/static/css/style.css
@@ -164,9 +164,6 @@ ul, ol {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale; }
 
-.main-content {
-  margin-top: 56px; }
-
 /*
   Calc the space displayed minus headers and footers to produce a min-height for
   pages that are lacking content to appropriately extend the page
@@ -1971,6 +1968,10 @@ section .min-max {
   .page-heading .page-action-group {
     margin-bottom: 0; }
 
+#landing .page-heading {
+  margin-bottom: 0px;
+}
+
 .page-heading .heading-cohort {
   background-color: #608aa3;
 }
diff --git a/static/css/vendor.css b/static/css/vendor.css
@@ -3768,7 +3768,7 @@ tbody.collapse.in {
 
 .navbar-fixed-top,
 .navbar-fixed-bottom {
-  position: fixed;
+  /*position: fixed;*/
   right: 0;
   left: 0;
   z-index: 1030; }
@@ -3778,7 +3778,7 @@ tbody.collapse.in {
       border-radius: 0; } }
 
 .navbar-fixed-top {
-  top: 0;
+  /*top: 0;*/
   border-width: 0 0 1px; }
 
 .navbar-fixed-bottom {
diff --git a/static/js/base.js b/static/js/base.js
@@ -222,11 +222,6 @@ require([
         sessionStorage.removeItem("reloadMsg");
 
         utils.checkForManifest();
-
-        if($('#liveText').siblings()[1].shadowRoot !== null) {
-            $('.main-content').css("margin-top", "0px");
-            $($('#liveText').siblings()[1]).css("margin-top", "56px");
-        }
     });
 });
 
diff --git a/templates/base.html b/templates/base.html
@@ -62,6 +62,7 @@
         const CHECK_MANIFEST_URL = "{% url 'check_user_manifest_base' %}";
     </script>
     <!-- OCPL Banner -->
+    <script async src="https://assets.adobedtm.com/6a4249cd0a2c/785de09de161/launch-70d67a6a40a8.min.js"></script>
 </head>
 <body class="{% block body_class %}content{% endblock %}" id="body">
 <!--Include site main header-->
diff --git a/templates/share/site_header.html b/templates/share/site_header.html
@@ -5,7 +5,6 @@
 {% load idc_collections_custom_tags %}
 
 <header class="site-header">
-
     {% is_allowed user as has_access %}
     <nav class="navbar navbar-default navbar-fixed-top idc-nav navbar-container">
         <div class="container-fluid">
@@ -108,7 +107,7 @@
                                 </button>
 
                                 <button class="item" title="Discourse">
-                                    <a href="" url="https://github.com/ImagingDataCommons/idc-index"
+                                    <a href="" url="https://discourse.canceridc.dev"
                                         class="external-link" data-toggle="modal"
                                         data-target="#external-web-warning" title="Discourse"
                                     >
@@ -136,7 +135,7 @@
                                     </a>
                                 </button>
                                 <button class="item" title="MHub">
-                                    <a href="" url="https://mhub.ai/" class="external-link" title="MHub">
+                                    <a href="" url="https://mhub.ai/models" class="external-link" title="MHub">
                                         <img class="grid-icon" src="{% static 'img/mhub_2.svg' %}" alt="MHub Logo" />
                                         AI<br/> Models<i class="fa-solid fa-external-link external-link-icon" aria-hidden="true"></i>
                                     </a>
@@ -185,5 +184,4 @@
                 </div>
         </div>
     </nav>
-    <script async src="https://assets.adobedtm.com/6a4249cd0a2c/785de09de161/launch-70d67a6a40a8.min.js"></script>
 </header>
