Skip to content

Commit

Permalink
Merge branch 'ldlink_5.6.7_dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoyao00 committed Jun 21, 2024
2 parents 0c5ddf3 + b59ced7 commit 6a9e571
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
2 changes: 1 addition & 1 deletion client/css/ncids.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ line-height: 1.6;

.usa-banner__header {
font-weight: 400;
margin-left: 2.5rem !important;
margin-left: 0rem !important;
margin-right: auto;
max-width: 87.5rem;
min-height: 3rem;
Expand Down
15 changes: 13 additions & 2 deletions client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<!-- <body class="d-flex flex-column vh-100" role="document"> -->
<body role="document">
<section class="usa-banner" aria-label="Official government website">
<!-- <section class="usa-banner" aria-label="Official government website">
<header class="usa-banner__header">
<div class="usa-banner__inner">
<div class="container" >
Expand All @@ -52,7 +52,7 @@
</div>
</header>
</section>
<header>
<header> -->
<!-- Set component's src attribute to url of html snippet -->
<include-html
src="https://cbiit.github.io/nci-softwaresolutions-elements/banners/government-shutdown.html"></include-html>
Expand All @@ -62,7 +62,18 @@ <h1 class="sr-only sr-only-focusable">L D link Webtool</h1>

<!-- Header -->
<div class="header" style="background-color: #F8F9FA;">

<div class="container ">
<header class="usa-banner__header">
<div class="usa-banner__inner">
<div class="container" >
<div class="usa-banner__header-text">
An official website of the United States government
</div>
</div>

</div>
</header>
<a href="https://dceg.cancer.gov/" target="_blank">
<!-- <img class="mw-100" height="90" src="dceg-logo.svg" alt="Division of Cancer Epidemiology &amp; Genetics"> -->
<img class="mw-100" height="90" src="NIH-LDlink-Logo.png" alt="NIH National Institutes of Health">
Expand Down
10 changes: 8 additions & 2 deletions client/news.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<p><b>LDlink 5.6.7 Release (06/20/2024)</b></p>
<p><b>LDlink 5.6.8 Release (06/21/2024)</b></p>
<ul>
<li>Removed domain change notice</li>
<li>Added usa government official flag banner</li>
<li>Added USA government official flag banner</li>
<li>Specified numpy version</li>
</ul>
<br>
<p><b>LDlink 5.6.7 release (02/21/2024) </b></p>
<ul>
<li>Forge DB Scores update</li>
</ul>
<br>
<p><b>LDlink 5.6.6 Release (10/20/2023)</b></p>
Expand Down
1 change: 1 addition & 0 deletions server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Flask==1.1.4
jinja2==2.11.3
MarkupSafe==1.1.1
mod_wsgi
numpy==1.23.1
pymongo
python-dateutil
python-dotenv
Expand Down

0 comments on commit 6a9e571

Please sign in to comment.