Skip to content

Commit 185dad9

Browse files
authored
Merge pull request #261 from TheJacksonLaboratory/develop
september 1 release
2 parents f2b9a8e + 70efb4d commit 185dad9

21 files changed

+119261
-118572
lines changed

client/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hpo-web",
3-
"version": "1.8.10",
3+
"version": "1.8.11",
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",

client/src/app/app.component.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,15 @@
4141
.sidenav .mat-menu-item.backButton .mat-icon {
4242
float: left;
4343
}
44+
45+
.banner {
46+
height: 30px;
47+
}
48+
49+
.banner p {
50+
margin: 0 0 0 2.5rem;
51+
}
52+
53+
.banner p a {
54+
color: white !important;
55+
}

client/src/app/app.component.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<mat-sidenav-container>
2+
<mat-toolbar class="banner" color="warn">
3+
<mat-icon>warning</mat-icon>
4+
<p>The API for this application is moving. <strong><a [routerLink]="['/data/ontology']">See the changes here.</a></strong></p>
5+
</mat-toolbar>
26
<navbar-hpo (navToggle)="sidenav.open(); mobileNavSection = 'home'"></navbar-hpo>
37
<mat-sidenav #sidenav class="sidenav">
48
<mat-nav-list>
@@ -56,6 +60,7 @@ <h3 class="center menuTitle">Menu</h3>
5660
<div *ngIf="mobileNavSection == 'dataMenu'">
5761
<button mat-menu-item (click)="sidenav.close()" routerLink="data/ontology"> Ontology</button>
5862
<button mat-menu-item (click)="sidenav.close()" routerLink="data/annotations"> Annotations</button>
63+
<button mat-menu-item (click)="sidenav.close()" routerLink="resources/phenopacket"> Annotations</button>
5964
<button mat-menu-item (click)="mobileNavigate('translationMenu')">Translation
6065
<mat-icon>arrow_right</mat-icon>
6166
</button>

client/src/app/shared/navbar/navbar.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<mat-menu [overlapTrigger]="false" #downloadsMenu="matMenu">
4747
<button mat-menu-item routerLink="data/ontology"> Ontology</button>
4848
<button mat-menu-item routerLink="data/annotations"> Annotations</button>
49+
<button mat-menu-item routerLink="resources/phenopacket"> Phenopacket</button>
4950
<button mat-menu-item [matMenuTriggerFor]="otherMenu"> Translation</button>
5051
<button mat-menu-item (click)="navigateToDocs()"> API</button>
5152
</mat-menu>

client/src/app/static/data/annotation-format/annotation-format.component.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,18 @@
55
.table-spacer td, .table-spacer th {
66
padding: 5px;
77
}
8+
9+
10+
.code-wrapper {
11+
border: 1px solid rgba(0,0,0,.2);
12+
border-radius: 4px;
13+
}
14+
15+
.code {
16+
padding: 20px;
17+
background: rgba(0,0,0,.01);
18+
}
19+
20+
.margin-auto {
21+
margin: auto auto;
22+
}

0 commit comments

Comments
 (0)