diff --git a/package-lock.json b/package-lock.json
index 450cdf9e1f790d22ccfb8a239dee3badd7307ba4..03e00508cddf754966da57e7fcafdc8b306b5024 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.4.0",
- "@ghsc/nshmp-template": "^19.3.1",
+ "@ghsc/nshmp-lib-ng": "^19.5.0",
+ "@ghsc/nshmp-template": "^19.4.1",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "19.4.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.4.0.tgz",
- "integrity": "sha1-odjGSToRIBUFvEYIhYj/YducyXo=",
+ "version": "19.5.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.5.0.tgz",
+ "integrity": "sha1-K2Qtr5ddaK3UE94WDinenzVyggc=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "19.3.1",
- "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.3.1.tgz",
- "integrity": "sha1-OA7V7TF2Xigvplxf2NxOK7WxO2Q=",
+ "version": "19.4.1",
+ "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.4.1.tgz",
+ "integrity": "sha1-RMZHQ3AxjUKNLdAYAlXEpInVSUU=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 167551998d8fd78f2f71223044c4e975791c1f17..514b40bf504fe209eb13fa22185e69d25478485b 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.4.0",
- "@ghsc/nshmp-template": "^19.3.1",
+ "@ghsc/nshmp-lib-ng": "^19.5.0",
+ "@ghsc/nshmp-template": "^19.4.1",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
index 960fb19527279ac63d844d93e2bccc0aee78dbcb..2cbd26cb3decefecff98642565a094a4db352474 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="table()"
- filename="hanging-wall-effects.csv"
- buttonText="Export to CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="table()"
+ filename="hanging-wall-effects.csv"
+ buttonText="Export to CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
index c495d3ea9c3bc5a323a97053d9c3a30ad466f83c..437e586a41efdb9f1d860bf09014a62619c4a0bd 100644
--- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
@@ -34,7 +34,7 @@
<li>
<div>
- <button mat-raised-button color="primary">Add Curve</button>
+ <button mat-raised-button class="primary">Add Curve</button>
</div>
<span>
@@ -61,7 +61,7 @@
<li>
<div>
- <button mat-raised-button color="warn">Clear Plot</button>
+ <button mat-raised-button class="error">Clear Plot</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
index 2fcea64161807ed3366225fdc07ea94f1688467d..129750678f163f2212c80a6d50b56664f9a53772 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="table()"
- filename="gmm-distance-means.csv"
- buttonText="Export Means to CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="table()"
+ filename="gmm-distance-means.csv"
+ buttonText="Export Means to CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
index ff48cf9987d2ea131c4e14a22236d0b1f9525d19..3903b9e6b4c57cd041bed2da6eadf29a28dfad96 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="meanTable()"
- filename="gmm-magnitude-means.csv"
- buttonText="Export Means as CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="meanTable()"
+ filename="gmm-magnitude-means.csv"
+ buttonText="Export Means as CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
@@ -29,12 +31,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="sigmaTable()"
- filename="gmm-magnitude-sigmas.csv"
- buttonText="Export Sigmas as CSV"
- title="Sigma Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="sigmaTable()"
+ filename="gmm-magnitude-sigmas.csv"
+ buttonText="Export Sigmas as CSV"
+ title="Sigma Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss b/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..22e9880442f51a1a817f017db9db8f25f474e35d 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss
@@ -0,0 +1,10 @@
+@use '@angular/material' as mat;
+
+.mmin-input,
+.mmax-input {
+ @include mat.form-field-overrides(
+ (
+ outlined-label-text-populated-size: 15px,
+ )
+ );
+}
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
index 03f25db20def3ba4f31226c40c0c0af22027e4dd..02e0cf3f60c8cf09141a7131cb310a29227d9c52 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="spectraTable()"
- filename="spectra-medians.csv"
- buttonText="Export Medians as CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="spectraTable()"
+ filename="spectra-medians.csv"
+ buttonText="Export Medians as CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
@@ -29,12 +31,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="sigmaTable()"
- filename="spectra-sigmas.csv"
- buttonText="Export Sigmas as CSV"
- title="Sigma Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="sigmaTable()"
+ filename="spectra-sigmas.csv"
+ buttonText="Export Sigmas as CSV"
+ title="Sigma Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
index f8987d5015b089807b76329a10ab3b8311671e9c..8c312367dd48d8c8c89760336fd9fd983e04a7b2 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
@@ -77,9 +77,8 @@
<!-- Event Parameters: centered down dip -->
<div class="grid-col-8">
<mat-checkbox
- class="down-dip-checkbox"
+ class="primary down-dip-checkbox"
[formControl]="form.controls.zHypCentered"
- color="primary"
>
Centered down-dip
</mat-checkbox>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
index 06b0961a45fe468a0aa8c4a2ea9b61a219d79c60..03931310796f1b50f93f39d64b94e2b17072faf8 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
@@ -66,7 +66,6 @@
<div class="grid-row">
<mat-checkbox
class="grid-col-12 rjb-rrup-checkbox"
- color="primary"
[formControl]="form.controls.derivePathParams"
>
Derive R<sub>JB</sub> and R<sub>RUP</sub>
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html
index 20799cc7d13f058a572fce39a951289072872091..13d3163e5e149967d44fd0a62b8a234ffb850647 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html
@@ -60,7 +60,7 @@
<mat-expansion-panel
class="contributions print-full-page print-page-break"
[expanded]="componentData()?.sources.length > 0"
- [disabled]="componentData()?.sources.length === 0"
+ [disabled]="disaggData() === null"
>
<mat-expansion-panel-header>
<mat-panel-title
@@ -76,7 +76,7 @@
<mat-expansion-panel
class="print-display-none"
[expanded]="componentData()?.data.length > 0"
- [disabled]="componentData()?.data.length === 0"
+ [disabled]="disaggData() === null"
>
<mat-expansion-panel-header>
<mat-panel-title
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss
index c11660db571078b05f431bf9a716cf244327c58a..3f2d58fddcc9551804d7247ce0d9ba2ac24ee6d1 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss
@@ -1,3 +1,5 @@
+@use '@angular/material' as mat;
+
.disagg-target-selector {
mat-radio-group {
display: flex;
@@ -10,3 +12,12 @@
}
}
}
+
+.disagg-target-return-period,
+.disagg-target-iml {
+ @include mat.form-field-overrides(
+ (
+ outlined-label-text-populated-size: 13px,
+ )
+ );
+}
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
index 7367b3299a9e1a28ad6d4fa65ffbc8529638eb5a..0869c54509c6d0e33f75d999ad61b554253848e1 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
@@ -7,7 +7,7 @@
<div class="print-display-none">
<button
mat-raised-button
- color="primary"
+ class="primary"
(click)="
service.saveContributions(componentData(), form.getRawValue())
"
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
index 60fad13793b636a249d7544c477c49aa9dd49bfd..70b49caef43f6d2e8db03254519e32ac6b16693e 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
@@ -4,9 +4,8 @@
<!-- Export button -->
<div class="print-display-none">
<button
- class="export-button"
+ class="primary export-button"
mat-raised-button
- color="primary"
[disabled]="componentData().data === null"
(click)="service.saveComponentData()"
>
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
index a49c9e9a6dd9675aca848d1e53c5cc8b4a0c67ed..19a0147c0147fa695939f4e0e20cc32f8bc1147d 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
@@ -6,7 +6,7 @@
<div class="print-display-none">
<button
mat-raised-button
- color="primary"
+ class="primary"
(click)="service.saveSummary(componentData(), form.getRawValue())"
>
Export as Text
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
index edd15e955156f04b1603574a53b9597484189c97..57ffd0284a5ee62ccdf8250f403ae54a1d36bef2 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
@@ -3,7 +3,7 @@
<div>
<button
mat-raised-button
- color="primary"
+ class="primary"
[disabled]="disaggData() === null"
(click)="exportReport()"
>
@@ -14,9 +14,8 @@
<!-- Export summary button -->
<div>
<button
- class="export-button"
+ class="primary export-button"
mat-raised-button
- color="primary"
[disabled]="disaggData() === null"
(click)="service.saveSummaryReport()"
>
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a8c5521a0025063b227324ef1d1618133f1a281a 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss
@@ -0,0 +1,5 @@
+@use '@ghsc/nshmp-template/styles/variables';
+
+button {
+ margin-bottom: variables.$form-field-padding-bottom;
+}
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
index 50e496fd4acbf570728a8e0ec1f38458f8fd03dd..851d0528720712ec869d552f1323a63b2c265ae4 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
@@ -13,12 +13,15 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="hazardTableData()"
- [filename]="hazardFilename() | lowercase"
- buttonText="Export Hazard as CSV"
- title="Hazard Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="hazardTableData()"
+ [filename]="hazardFilename() | lowercase"
+ buttonText="Export Hazard as CSV"
+ title="Hazard Data"
+ class="grid-container-widescreen"
+ />
+ </div>
</ng-template>
</mat-tab>
@@ -29,12 +32,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="spectraTableData()"
- [filename]="spectraFilename() | lowercase"
- buttonText="Export Response Spectra as CSV"
- title="Response Spectra Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="spectraTableData()"
+ [filename]="spectraFilename() | lowercase"
+ buttonText="Export Response Spectra as CSV"
+ title="Response Spectra Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
index 37f191ef2f06af15ec7cf9c7f8e779b889152136..254823e3121c6fd2239d6a8a472a8ad69594d8f6 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
@@ -13,7 +13,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-curve-data />
+ <div class="grid-container-widescreen">
+ <app-curve-data />
+ </div>
</ng-template>
</mat-tab>
@@ -24,7 +26,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-spectrum-data />
+ <div class="grid-container-widescreen">
+ <app-spectrum-data />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss b/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss
index 9e74c7b707a09482023690742b84590cc1e219ea..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss
@@ -1,3 +0,0 @@
-.data-table-container {
- padding: 1em clamp(0.25em, 0.1em + 1vw, 1em);
-}
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss b/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss
index 9e74c7b707a09482023690742b84590cc1e219ea..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss
@@ -1,3 +0,0 @@
-.data-table-container {
- padding: 1em clamp(0.25em, 0.1em + 1vw, 1em);
-}
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
index 12a9708f49ce9aba30d3bb1c3d58d01b81783e1c..7d566fa0a5d5b31831a6377a1c9507218fd66873 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
@@ -31,7 +31,7 @@
<li>
<div>
- <button mat-raised-button color="primary">Show Logs</button>
+ <button mat-raised-button class="primary">Show Logs</button>
</div>
<span>
@@ -58,7 +58,7 @@
<li>
<div>
- <button mat-raised-button color="warn">Terminate Job</button>
+ <button mat-raised-button class="error">Terminate Job</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
index 6639d9e4c161e7eea4b758e70f5027ba46da7d04..a1c7d178314a87f2404089e67bc7c35d479e0934 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
@@ -26,7 +26,7 @@ $toolbarHeight: 3.5em;
}
.logs-toolbar {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent);
+ background-color: variables.$nshmp-secondary-color;
font-size: clamp(8px, 6px + 1vw, 14px);
font-weight: normal;
height: $toolbarHeight;
@@ -66,7 +66,3 @@ $toolbarHeight: 3.5em;
font-weight: bold;
font-style: italic;
}
-
-body.dark-mode :host .logs-toolbar {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent, 900);
-}
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
index d5ded724e9343c090f7fbbe90199f892fba1fa95..2396d198d862701ebe3235781dad5b4bca57bc34 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
@@ -13,9 +13,8 @@
>
<div class="grid-col-6 padding-x-1">
<button
- class="grid-col-12"
+ class="primary grid-col-12"
mat-raised-button
- color="primary"
type="submit"
[disabled]="form?.invalid"
>
@@ -25,9 +24,8 @@
<div class="grid-col-6 padding-x-1">
<button
- class="grid-col-12"
+ class="error grid-col-12"
mat-raised-button
- color="warn"
type="button"
[disabled]="logResponse() === null"
(click)="service.callJobInfoService()"
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss
index df192e28370fa5f13d2d8e5e09a6c15dbdc055f0..b5adf4e0d908a3f10bc69cf4a529b225eacd327b 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss
@@ -1,4 +1,5 @@
@use '@ghsc/nshmp-template/styles/mixins';
+@use '@angular/material' as mat;
:host {
display: flex;
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
index d37f102ff22e06b5ec21c79aa56271fb108eb2bc..964d2a464ee040df8b284466769088be86ee362f 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
@@ -34,7 +34,7 @@
<li>
<div>
- <button mat-raised-button color="primary">Get Job History</button>
+ <button mat-raised-button class="primary">Get Job History</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
index 905b0609ce6f04a5198be5f06da5391e91bb2144..e5ce74a03d5906dc78c52b34c849dbe87b5f68e4 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
@@ -27,9 +27,8 @@
>
<div class="grid-col-12 padding-x-1">
<button
- class="grid-col-12"
+ class="primary grid-col-12"
mat-raised-button
- color="primary"
type="submit"
[disabled]="form.invalid"
>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
index 4683b5f22254625062035d3e12551f5d2cb21741..74ca37a77e1c21095ecb28896173f75df89696e1 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
@@ -41,7 +41,11 @@
padding-top: 2em;
}
+tr {
+ background-color: variables.$nshmp-secondary-color;
+}
+
tr:hover {
cursor: pointer;
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent);
+ background-color: var(--mat-sys-surface-container-highest);
}
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
index 83b08889787220f98934dd7e4f5c5740f4504391..55a9eb56b157e280d6264ee3070108216a48c477 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
@@ -1,567 +1,549 @@
<div>
- <nshmp-template-form-fields>
- <form
- class="settings-section width-full"
- [formGroup]="form"
- (submit)="service.callService()"
- >
- <mat-accordion multi>
- <!-- Import section -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>Configuration Import</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection import-section">
- <div class="settings-subsection--section">
- <!-- Import: file upload -->
- <div>
- Already have the below information? <br />
- Import the
- <a (click)="service.activeTab(configTab().position)">
- configuration
- </a>
- as
- <a (click)="service.activeTab(jsonTab().position)">JSON</a>
- or
- <a (click)="service.activeTab(yamlTab().position)">YAML</a>
- </div>
- <br />
- <input
- #configEl
- type="file"
- accept=".json,.yml,.yaml"
- (change)="importConfigFile()"
- />
+ <form
+ class="settings-section width-full"
+ [formGroup]="form"
+ (submit)="service.callService()"
+ >
+ <mat-accordion multi>
+ <!-- Import section -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>Configuration Import</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection import-section">
+ <div class="settings-subsection--section">
+ <!-- Import: file upload -->
+ <div>
+ Already have the below information? <br />
+ Import the
+ <a (click)="service.activeTab(configTab().position)">
+ configuration
+ </a>
+ as
+ <a (click)="service.activeTab(jsonTab().position)">JSON</a>
+ or
+ <a (click)="service.activeTab(yamlTab().position)">YAML</a>
</div>
+ <br />
+ <input
+ #configEl
+ type="file"
+ accept=".json,.yml,.yaml"
+ (change)="importConfigFile()"
+ />
</div>
- </mat-expansion-panel>
-
- <!-- Cloud config-->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>Cloud Configuration</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection aws-section">
- <div class="settings-subsection--section">
- <!-- AWS information: instance type -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- AWS EC2 Isntance Type
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.cloudConfig.controls.instanceType
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Memory icon">memory</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for AWS EC2 isntance type info"
- href="https://aws.amazon.com/ec2/instance-types/"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-hint> The AWS EC2 instance type </mat-hint>
- <mat-error>Must not contain spaces</mat-error>
- </mat-form-field>
-
- <p>Common instance types:</p>
- <ul class="usa-list">
- @for (instance of commonInstances; track instance) {
- <li>
- {{ instance.type }}
- (CPU: {{ instance.cpu }}, Memory: {{ instance.mem }} GB)
- </li>
- }
- </ul>
- </div>
+ </div>
+ </mat-expansion-panel>
+
+ <!-- Cloud config-->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>Cloud Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection aws-section">
+ <div class="settings-subsection--section">
+ <!-- AWS information: instance type -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ AWS EC2 Isntance Type
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.cloudConfig.controls.instanceType"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Memory icon">memory</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for AWS EC2 isntance type info"
+ href="https://aws.amazon.com/ec2/instance-types/"
+ target="__blank"
+ class="primary"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-hint> The AWS EC2 instance type </mat-hint>
+ <mat-error>Must not contain spaces</mat-error>
+ </mat-form-field>
+
+ <p>Common instance types:</p>
+ <ul class="usa-list">
+ @for (instance of commonInstances; track instance) {
+ <li>
+ {{ instance.type }}
+ (CPU: {{ instance.cpu }}, Memory: {{ instance.mem }} GB)
+ </li>
+ }
+ </ul>
</div>
- </mat-expansion-panel>
-
- <!-- NSHMP Config section -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>NSHMP Configuration</mat-panel-title>
- </mat-expansion-panel-header>
- <mat-divider />
- <div class="settings-subsection program-section">
- <div class="settings-subsection--section">
- <!-- NSHMP config: email -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label
- >Email <span class="form-required">*</span></mat-label
- >
- <input
- matInput
- [formControl]="form.controls.nshmpConfig.controls.email"
- />
- <span matPrefix>
- <mat-icon aria-label="Email icon">email</mat-icon>
- </span>
- <mat-error>Must be a valid USGS email</mat-error>
- <mat-hint>Email to recieve notifications from AWS</mat-hint>
- </mat-form-field>
-
- <mat-divider />
-
- <!-- NSHMP config: Source code -->
- <div class="settings-subsection padding-top-1">
- <mat-label class="settings-subsection--label">
- nshmp-haz Source Code
- </mat-label>
- <div class="settings-subsection--section">
- <!-- NSHMP config: source code Git URL -->
- <mat-form-field class="grid-col-12 tablet:grid-col-12">
- <mat-label>
- Source Code Git URL
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.sourceCodeGitUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for GitLab git clone URL info"
- href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- <mat-hint>The Git URL to the nshmp-haz repository</mat-hint>
- </mat-form-field>
-
- <!-- NSHMP config: source code SHA -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- Source Code Branch, Tag, or Commit
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.sourceCodeSha
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <mat-hint>
- The branch, tag, or commit of the nshmp-haz repository
- </mat-hint>
- <mat-error>Must not contain spaces</mat-error>
- </mat-form-field>
-
- <!-- NSHMP config: class name -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- Class Name to Run<span class="form-required">*</span>
- </mat-label>
- <mat-select
- [formControl]="
- form.controls.nshmpConfig.controls.className
- "
- >
- @for (class of nshmpHazClasses; track class) {
- <mat-option [value]="class">
- {{ class }}
- </mat-option>
- }
- </mat-select>
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for list of Java classes to run"
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/src/main/java/gov/usgs/earthquake/nshmp"
- target="__blank"
- color="primary"
+ </div>
+ </mat-expansion-panel>
+
+ <!-- NSHMP Config section -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>NSHMP Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+ <mat-divider />
+ <div class="settings-subsection program-section">
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: email -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>Email <span class="form-required">*</span></mat-label>
+ <input
+ matInput
+ [formControl]="form.controls.nshmpConfig.controls.email"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Email icon">email</mat-icon>
+ </span>
+ <mat-error>Must be a valid USGS email</mat-error>
+ <mat-hint>Email to recieve notifications from AWS</mat-hint>
+ </mat-form-field>
+
+ <mat-divider />
+
+ <!-- NSHMP config: Source code -->
+ <div class="settings-subsection padding-top-1">
+ <mat-label class="settings-subsection--label">
+ nshmp-haz Source Code
+ </mat-label>
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: source code Git URL -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-12">
+ <mat-label>
+ Source Code Git URL
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.sourceCodeGitUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for GitLab git clone URL info"
+ href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
+ target="__blank"
+ c="primary"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ <mat-hint>The Git URL to the nshmp-haz repository</mat-hint>
+ </mat-form-field>
+
+ <!-- NSHMP config: source code SHA -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ Source Code Branch, Tag, or Commit
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.sourceCodeSha
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <mat-hint>
+ The branch, tag, or commit of the nshmp-haz repository
+ </mat-hint>
+ <mat-error>Must not contain spaces</mat-error>
+ </mat-form-field>
+
+ <!-- NSHMP config: class name -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ Class Name to Run<span class="form-required">*</span>
+ </mat-label>
+ <mat-select
+ [formControl]="form.controls.nshmpConfig.controls.className"
+ >
+ @for (class of nshmpHazClasses; track class) {
+ <mat-option [value]="class">
+ {{ class }}
+ </mat-option>
+ }
+ </mat-select>
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for list of Java classes to run"
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/src/main/java/gov/usgs/earthquake/nshmp"
+ target="__blank"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-hint>Java class name of class to run</mat-hint>
+ </mat-form-field>
+
+ <!-- NSHMP config: nshmp-lib -->
+ <div class="settings-subsection margin-top-1">
+ <mat-label class="settings-subsection--label">
+ <mat-slide-toggle
+ [formControl]="form.controls.overrideNshmpLib"
+ class="lib-toggle"
>
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-hint>Java class name of class to run</mat-hint>
- </mat-form-field>
-
- <!-- NSHMP config: nshmp-lib -->
- <div class="settings-subsection margin-top-1">
- <mat-label class="settings-subsection--label">
- <mat-slide-toggle
- [formControl]="form.controls.overrideNshmpLib"
- color="primary"
- class="lib-toggle"
+ Provide nshmp-lib Dependency
+ </mat-slide-toggle>
+ </mat-label>
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: nshmp-lib Git URL -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-8">
+ <mat-label>
+ nshmp-lib Git URL
+ @if (form.value.overrideNshmpLib) {
+ <span class="form-required"> * </span>
+ }
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.nshmpLibGitUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for GitLab git clone URL info"
+ href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
+ target="__blank"
>
- Provide nshmp-lib Dependency
- </mat-slide-toggle>
- </mat-label>
- <div class="settings-subsection--section">
- <!-- NSHMP config: nshmp-lib Git URL -->
- <mat-form-field class="grid-col-12 tablet:grid-col-8">
- <mat-label>
- nshmp-lib Git URL
- @if (form.value.overrideNshmpLib) {
- <span class="form-required"> * </span>
- }
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.nshmpLibGitUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for GitLab git clone URL info"
- href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- <mat-hint
- >The Git URL to the nshmp-lib repository</mat-hint
- >
- </mat-form-field>
-
- <!-- NSHMP config: nshmp-lib source code SHA -->
- <mat-form-field
- class="grid-col-12 tablet:grid-col-4 margin-bottom-1"
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ <mat-hint
+ >The Git URL to the nshmp-lib repository</mat-hint
>
- <mat-label>
- nshmp-lib Branch, Tag, or Commit
- @if (form.value.overrideNshmpLib) {
- <span class="form-required"> * </span>
- }
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.nshmpLibSha
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- <mat-hint>
- The branch, tag, or commit of the nshmp-lib repository
- </mat-hint>
- </mat-form-field>
- </div>
- </div>
- </div>
- </div>
+ </mat-form-field>
- <mat-divider />
-
- <div class="settings-subsection">
- <mat-label class="settings-subsection--label">
- National Seismic Hazard Model
- </mat-label>
- <div class="settings-subsection--section">
- <!-- NSHMP config: model Git URL -->
- <mat-form-field class="grid-col-12">
- <mat-label>
- National Seismic Hazard Model Git URL
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.modelGitUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Plot icon">show_chart</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for GitLab URL info"
- href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
- target="__blank"
- color="primary"
+ <!-- NSHMP config: nshmp-lib source code SHA -->
+ <mat-form-field
+ class="grid-col-12 tablet:grid-col-4 margin-bottom-1"
>
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-hint>The Git URL to the NSHM repository</mat-hint>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- </mat-form-field>
-
- <!-- NSHMP config: model SHA -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- Model Branch, Tag, or Commit
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.modelSha
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <mat-error>Must not contain spaces</mat-error>
- <mat-hint>
- The branch, tag, or commit of the NSHM repository
- </mat-hint>
- </mat-form-field>
-
- <!-- NSHMP config: model path -->
- <mat-form-field
- class="grid-col-12 tablet:grid-col-6 margin-bottom-1"
- >
- <mat-label>NSHM Path Inside Tarball</mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.modelPath
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Folder icon">folder</mat-icon>
- </span>
- <mat-error>Must not contain spaces</mat-error>
- <mat-hint>Path inside tarball to model</mat-hint>
- </mat-form-field>
+ <mat-label>
+ nshmp-lib Branch, Tag, or Commit
+ @if (form.value.overrideNshmpLib) {
+ <span class="form-required"> * </span>
+ }
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.nshmpLibSha
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ <mat-hint>
+ The branch, tag, or commit of the nshmp-lib repository
+ </mat-hint>
+ </mat-form-field>
+ </div>
</div>
</div>
+ </div>
- <mat-divider />
-
- <!-- NSHMP config: site file -->
- <div class="settings-subsection padding-top-1">
- <mat-label class="settings-subsection--label"
- >Site File</mat-label
+ <mat-divider />
+
+ <div class="settings-subsection">
+ <mat-label class="settings-subsection--label">
+ National Seismic Hazard Model
+ </mat-label>
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: model Git URL -->
+ <mat-form-field class="grid-col-12">
+ <mat-label>
+ National Seismic Hazard Model Git URL
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.modelGitUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Plot icon">show_chart</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for GitLab URL info"
+ href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
+ target="__blank"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-hint>The Git URL to the NSHM repository</mat-hint>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ </mat-form-field>
+
+ <!-- NSHMP config: model SHA -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ Model Branch, Tag, or Commit
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.nshmpConfig.controls.modelSha"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <mat-error>Must not contain spaces</mat-error>
+ <mat-hint>
+ The branch, tag, or commit of the NSHM repository
+ </mat-hint>
+ </mat-form-field>
+
+ <!-- NSHMP config: model path -->
+ <mat-form-field
+ class="grid-col-12 tablet:grid-col-6 margin-bottom-1"
>
- <div class="settings-subsection--section">
- <div class="grid-col-12 padding-top-1">
- Upload CSV or GeoJSON
- <a
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
- target="__blank"
- >
- Site File
- </a>
- <br />
- <input
- #uploadSiteFileEl
- class="padding-y-1"
- type="file"
- accept=".geojson,.csv"
- (change)="importSiteFile()"
- />
- </div>
+ <mat-label>NSHM Path Inside Tarball</mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.nshmpConfig.controls.modelPath"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Folder icon">folder</mat-icon>
+ </span>
+ <mat-error>Must not contain spaces</mat-error>
+ <mat-hint>Path inside tarball to model</mat-hint>
+ </mat-form-field>
+ </div>
+ </div>
- <mat-form-field class="grid-col-12 padding-top-2">
- <mat-label>
- URL to nshmp-haz Site File.
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- [formControl]="
- form.controls.nshmpConfig.controls.siteFileUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Note icon">note_add</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for site file info"
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-error> Must be a valid URL </mat-error>
- <mat-hint
- >The URL to a GeoJSON or CSV file to run with</mat-hint
- >
- </mat-form-field>
+ <mat-divider />
+
+ <!-- NSHMP config: site file -->
+ <div class="settings-subsection padding-top-1">
+ <mat-label class="settings-subsection--label"
+ >Site File</mat-label
+ >
+ <div class="settings-subsection--section">
+ <div class="grid-col-12 padding-top-1">
+ Upload CSV or GeoJSON
+ <a
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
+ target="__blank"
+ >
+ Site File
+ </a>
+ <br />
+ <input
+ #uploadSiteFileEl
+ class="padding-y-1"
+ type="file"
+ accept=".geojson,.csv"
+ (change)="importSiteFile()"
+ />
</div>
+
+ <mat-form-field class="grid-col-12 padding-top-2">
+ <mat-label>
+ URL to nshmp-haz Site File.
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ [formControl]="
+ form.controls.nshmpConfig.controls.siteFileUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Note icon">note_add</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for site file info"
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
+ target="__blank"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-error> Must be a valid URL </mat-error>
+ <mat-hint
+ >The URL to a GeoJSON or CSV file to run with</mat-hint
+ >
+ </mat-form-field>
</div>
</div>
</div>
- </mat-expansion-panel>
-
- <!-- Map config -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>GMT Map Configuration</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection">
- <div class="settings-subsection--section">
- <!-- Map config: Title -->
- <mat-form-field class="grid-col-12">
- <mat-label> Title (Optional)</mat-label>
- <input
- matInput
- type="text"
- [formControl]="form.controls.mapConfig.controls.title"
- />
- <mat-hint>First row of GMT hazard map title</mat-hint>
- </mat-form-field>
-
- <!-- Map config: Region -->
- <mat-form-field class="grid-col-12 margin-bottom-neg-1">
- <mat-label> Region (Optional)</mat-label>
- <mat-select
- [formControl]="form.controls.mapConfig.controls.region"
- >
- @for (keyValue of mapRegions; track keyValue) {
- <mat-option [value]="keyValue.value">
- {{ keyValue.key }}
- </mat-option>
- }
- </mat-select>
- <mat-hint>Region bounds, default is based on data</mat-hint>
- </mat-form-field>
- </div>
+ </div>
+ </mat-expansion-panel>
+
+ <!-- Map config -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>GMT Map Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection">
+ <div class="settings-subsection--section">
+ <!-- Map config: Title -->
+ <mat-form-field class="grid-col-12">
+ <mat-label> Title (Optional)</mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.mapConfig.controls.title"
+ />
+ <mat-hint>First row of GMT hazard map title</mat-hint>
+ </mat-form-field>
+
+ <!-- Map config: Region -->
+ <mat-form-field class="grid-col-12 margin-bottom-neg-1">
+ <mat-label> Region (Optional)</mat-label>
+ <mat-select
+ [formControl]="form.controls.mapConfig.controls.region"
+ >
+ @for (keyValue of mapRegions; track keyValue) {
+ <mat-option [value]="keyValue.value">
+ {{ keyValue.key }}
+ </mat-option>
+ }
+ </mat-select>
+ <mat-hint>Region bounds, default is based on data</mat-hint>
+ </mat-form-field>
</div>
- </mat-expansion-panel>
-
- <!-- Calc Config section -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>Calc Configuration</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection program-section">
- <div class="settings-subsection--section">
- <!-- Calc config: config file -->
- <div class="settings-subsection padding-top-1">
- <mat-label class="settings-subsection--label">
- Calculation Configuration File
- </mat-label>
-
- <div class="settings-subsection--section padding-top-1">
- <div class="grid-col-12">
- Upload nshmp-haz
- <a
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Calculation-Configuration.md"
- target="__blank"
- >
- Calculation Configuration File
- </a>
- <br />
- <input
- #calcConfigEl
- class="padding-y-1"
- type="file"
- accept=".json"
- (change)="importCalcConfigFile()"
- />
- </div>
+ </div>
+ </mat-expansion-panel>
+
+ <!-- Calc Config section -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>Calc Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection program-section">
+ <div class="settings-subsection--section">
+ <!-- Calc config: config file -->
+ <div class="settings-subsection padding-top-1">
+ <mat-label class="settings-subsection--label">
+ Calculation Configuration File
+ </mat-label>
+
+ <div class="settings-subsection--section padding-top-1">
+ <div class="grid-col-12">
+ Upload nshmp-haz
+ <a
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Calculation-Configuration.md"
+ target="__blank"
+ >
+ Calculation Configuration File
+ </a>
+ <br />
+ <input
+ #calcConfigEl
+ class="padding-y-1"
+ type="file"
+ accept=".json"
+ (change)="importCalcConfigFile()"
+ />
+ </div>
- <div class="grid-col-12 padding-y-2">
- <mat-expansion-panel
- [disabled]="calcConfig() === null"
- [expanded]="calcConfig() !== null"
- >
- <mat-expansion-panel-header>
- <mat-panel-title
- >Calculation Configuration</mat-panel-title
- >
- <mat-panel-description>
- Imported configuration
- </mat-panel-description>
- </mat-expansion-panel-header>
-
- @for (calcConfig of calcConfig(); track calcConfig) {
- <div>
- <pre class="code-block">
+ <div class="grid-col-12 padding-y-2">
+ <mat-expansion-panel
+ [disabled]="calcConfig() === null"
+ [expanded]="calcConfig() !== null"
+ >
+ <mat-expansion-panel-header>
+ <mat-panel-title
+ >Calculation Configuration</mat-panel-title
+ >
+ <mat-panel-description>
+ Imported configuration
+ </mat-panel-description>
+ </mat-expansion-panel-header>
+
+ @for (calcConfig of calcConfig(); track calcConfig) {
+ <div>
+ <pre class="code-block">
<code>
{{ calcConfigJson(calcConfig) }}
</code>
</pre>
- </div>
- }
- </mat-expansion-panel>
- </div>
+ </div>
+ }
+ </mat-expansion-panel>
</div>
</div>
</div>
</div>
- </mat-expansion-panel>
- </mat-accordion>
-
- <mat-divider />
-
- <!-- Buttons -->
- <div class="padding-y-2 grid-col-12">
- <button
- mat-raised-button
- color="primary"
- type="submit"
- [disabled]="form.invalid"
- >
- Submit Job
- </button>
- <button
- class="float-right"
- mat-raised-button
- color="warn"
- type="reset"
- (click)="service.resetForm()"
- [disabled]="form.pristine"
- >
- Reset
- </button>
- </div>
- </form>
- </nshmp-template-form-fields>
+ </div>
+ </mat-expansion-panel>
+ </mat-accordion>
+
+ <mat-divider />
+
+ <!-- Buttons -->
+ <div class="padding-y-2 grid-col-12">
+ <button
+ mat-raised-button
+ class="primary"
+ type="submit"
+ [disabled]="form.invalid"
+ >
+ Submit Job
+ </button>
+ <button
+ class="error float-right"
+ mat-raised-button
+ type="reset"
+ (click)="service.resetForm()"
+ [disabled]="form.pristine"
+ >
+ Reset
+ </button>
+ </div>
+ </form>
</div>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts
index cb48cdafda5d507c4307408aed85f2e1250fbb8b..a52da6d578fa7617a4cb26369e9c3405cb90426e 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts
@@ -33,7 +33,6 @@ import {MatSelect} from '@angular/material/select';
import {MatSlideToggle} from '@angular/material/slide-toggle';
import {MatTab} from '@angular/material/tabs';
import {MatTooltip} from '@angular/material/tooltip';
-import {NshmpTemplateFormFieldsComponent} from '@ghsc/nshmp-template';
import {CalcConfig} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
import {Subscription} from 'rxjs';
import * as YAML from 'yaml';
@@ -69,7 +68,6 @@ import {JobSubmittedComponent} from '../job-submitted/job-submitted.component';
MatSlideToggle,
MatExpansionPanelDescription,
MatButton,
- NshmpTemplateFormFieldsComponent,
ReactiveFormsModule,
MatIcon,
],
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
index c3018fa9ad6098e5f978e2cab24a336db9bf1d5a..a9d1ea24a91dc615374d80f49aa03fc4f1d0680f 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
@@ -96,7 +96,7 @@
<div class="padding-y-2">
<button
mat-raised-button
- color="primary"
+ class="primary"
type="button"
[disabled]="history().length === 0"
(click)="service.clearHistory()"
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
index 4ea7f4b9b89db561fac33e76c76680cf6655aee8..8841a66f1c2fe408a21f31560c4269c97df64087 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
@@ -30,7 +30,7 @@
@if (serviceResponse?.response; as response) {
<button
mat-raised-button
- color="primary"
+ class="primary"
(click)="checkJob(response)"
>
Check on Job
@@ -43,10 +43,9 @@
<div mat-dialog-actions>
<button
- class="float-right"
+ class="secondary float-right"
mat-raised-button
[mat-dialog-close]="true"
- color="accent"
>
Close
</button>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
index d1f384294926e495a65f7333160e012002c5baba..3fe991168f14f73b327f04ae832a6132aa0a398a 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
@@ -34,7 +34,7 @@
<li>
<div>
- <button mat-raised-button color="warn">Terminate Job</button>
+ <button mat-raised-button class="error">Terminate Job</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
index a741a95660f2b880eec84a44d294860d246fca82..3aa380b2572c26360dbee9a4d8b97c55f496a655 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
@@ -1,32 +1,30 @@
-<nshmp-template-form-fields>
- <div class="grid-container center-x form">
- <form
- class="grid-col-10 tablet:grid-col-8"
- [formGroup]="form"
- (submit)="service.callJobInfoService()"
- >
- <mat-label class="label">AWS nshmp-haz Job ID</mat-label>
+<div class="grid-container center-x form">
+ <form
+ class="grid-col-10 tablet:grid-col-8"
+ [formGroup]="form"
+ (submit)="service.callJobInfoService()"
+ >
+ <mat-label class="label">AWS nshmp-haz Job ID</mat-label>
- <mat-form-field class="grid-col-12">
- <mat-label>Job ID <span class="form-required">*</span></mat-label>
- <input matInput type="text" [formControl]="form.controls.id" />
- <div matSuffix matTooltip="The id of the running job to terminate">
- <mat-icon aria-label="Info icon">info</mat-icon>
- </div>
- <mat-hint>The id of the running job to terminate</mat-hint>
- </mat-form-field>
-
- <!-- Buttons -->
- <div class="padding-y-2 grid-col-12">
- <button
- mat-raised-button
- color="warn"
- type="submit"
- [disabled]="form.invalid"
- >
- Terminate Job
- </button>
+ <mat-form-field class="grid-col-12">
+ <mat-label>Job ID <span class="form-required">*</span></mat-label>
+ <input matInput type="text" [formControl]="form.controls.id" />
+ <div matSuffix matTooltip="The id of the running job to terminate">
+ <mat-icon aria-label="Info icon">info</mat-icon>
</div>
- </form>
- </div>
-</nshmp-template-form-fields>
+ <mat-hint>The id of the running job to terminate</mat-hint>
+ </mat-form-field>
+
+ <!-- Buttons -->
+ <div class="padding-y-2 grid-col-12">
+ <button
+ mat-raised-button
+ class="error"
+ type="submit"
+ [disabled]="form.invalid"
+ >
+ Terminate Job
+ </button>
+ </div>
+ </form>
+</div>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts
index 38b8480ecd485ae5af2eb0e9250c55cfc3eb9758..20faf93116dddb2e8a025519f99ab19cd25cb1c6 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts
@@ -9,7 +9,6 @@ import {
import {MatIcon} from '@angular/material/icon';
import {MatInput} from '@angular/material/input';
import {MatTooltip} from '@angular/material/tooltip';
-import {NshmpTemplateFormFieldsComponent} from '@ghsc/nshmp-template';
import {AppService} from '../../services/app.service';
@@ -24,7 +23,6 @@ import {AppService} from '../../services/app.service';
MatSuffix,
MatTooltip,
MatHint,
- NshmpTemplateFormFieldsComponent,
ReactiveFormsModule,
MatIcon,
],
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
index 1defdd8025f3e43687b10a8c8ea75787b22e9eb3..31658e81353166e52b197496859fc46abc5ee320 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
@@ -120,7 +120,7 @@
extended
(click)="service.addLocationForm()"
type="button"
- color="secondary"
+ class="secondary"
>
<mat-icon>add</mat-icon>
Add additional location
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html
index 3a01a24d4c7d77ae994baaf6334d73485b7747c1..8080c78fac32e548228ca9dc2bb6f71d7c0ed602 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html
@@ -1,13 +1,13 @@
-@for (table of tables(); track table) {
- <nshmp-lib-ng-data-table-panel
- [table]="table.tables"
- filename="geophysical-profiles.csv"
- buttonText="Export to CSV"
- [title]="table.title"
- />
-}
-
<div class="grid-container-widescreen">
+ @for (table of tables(); track table) {
+ <nshmp-lib-ng-data-table-panel
+ [table]="table.tables"
+ filename="geophysical-profiles.csv"
+ buttonText="Export to CSV"
+ [title]="table.title"
+ />
+ }
+
<mat-accordion>
<mat-expansion-panel expanded>
<mat-expansion-panel-header>
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
index 71bd80d31ff39fe1d68e6232b50e8198fcc266bc..42f443f767c04ffe838764e07c344d8b25b659a2 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
@@ -7,12 +7,11 @@ td {
body.dark-mode :host {
table {
- color: mat.m2-get-color-from-palette(variables.$nshmp-accent, 200);
+ color: variables.$nshmp-on-primary-color;
th,
td {
- border: 1px solid
- mat.m2-get-color-from-palette(variables.$nshmp-accent, 700);
+ border: 1px solid var(--mat-sys-surface-container-highest);
border-left: 0;
border-right: 0;
}
diff --git a/projects/nshmp-apps/src/app/services/components/content/content.component.scss b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
index ff5faac1291b12049c39c7f2267a422e93b8e786..ec8d1ba1ceb99d44bcefaa5d50de2b1b465579b7 100644
--- a/projects/nshmp-apps/src/app/services/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
@@ -64,7 +64,7 @@ $sidenav-width: 300px;
$sidenav-collapsed-width: 65px;
mat-sidenav {
- background-color: #fafafa;
+ background-color: variables.$nshmp-secondary-color;
border-right: unset;
width: $sidenav-width;
@@ -84,15 +84,7 @@ mat-sidenav {
}
mat-nav-list {
- border-right: solid 3px variables.$theme-color;
-
- a {
- @include mat.list-typography(
- mat.m2-define-typography-config(
- $body-2: mat.m2-define-typography-level($font-size: 14px)
- )
- );
- }
+ border-right: solid 3px variables.$nshmp-primary-color;
a.active {
@include mat.list-overrides(
@@ -100,15 +92,6 @@ mat-sidenav {
list-item-supporting-text-color: #3d5e80,
)
);
-
- @include mat.list-typography(
- mat.m2-define-typography-config(
- $body-2: mat.m2-define-typography-level(
- $font-size: 14px,
- $font-weight: 800
- )
- )
- );
}
}
}
@@ -122,13 +105,6 @@ mat-sidenav.collapsed {
}
body.dark-mode :host {
- mat-sidenav {
- background-color: mat.m2-get-color-from-palette(
- variables.$nshmp-accent,
- 800
- );
- }
-
.card-section h4 {
color: rgba(255, 255, 255, 0.7);
}
diff --git a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
index aea11d8ac62e8b71ea39a65df1063c271d6c226c..c8253e42bb05bd0aa06cd99e7af77d573ae2c291 100644
--- a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
@@ -13,7 +13,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-logic-tree />
+ <div class="grid-container-widescreen">
+ <app-logic-tree />
+ </div>
</ng-template>
</mat-tab>
@@ -24,7 +26,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-data />
+ <div class="grid-container-widescreen">
+ <app-data />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
index 36c03aa08c323652eabee9fc15e619cd74927ef8..1c5323702c4373ad73bf881e35de85b9ea04307f 100644
--- a/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
@@ -49,20 +49,14 @@
<div class="plot-options">
<!-- Cumulative -->
<div class="grid-row">
- <mat-slide-toggle
- color="primary"
- [formControl]="formGroup.controls.cumulative"
- >
+ <mat-slide-toggle [formControl]="formGroup.controls.cumulative">
Cumulative
</mat-slide-toggle>
</div>
<!-- Weighted MFDs -->
<div class="grid-row">
- <mat-slide-toggle
- color="primary"
- [formControl]="formGroup.controls.weightedMfds"
- >
+ <mat-slide-toggle [formControl]="formGroup.controls.weightedMfds">
Weighted MFDs
</mat-slide-toggle>
</div>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
index ab077dcbbe4a42ac00c5079a26935a73bcdeac8c..67b23cb0e5f456f848378a7bdffbdb7f70d32c48 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
@@ -23,7 +23,7 @@
<ul class="icon-list">
<li>
<div>
- <mat-slide-toggle color="primary" />
+ <mat-slide-toggle />
</div>
<span> Click on the toggle to toggle visibility of that layer. </span>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
index 9fa0c207b355c476ad5e39a31f2615f4a944b5c0..d96409433ef97c1a0efb6aec2593f62cd76d13b6 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
@@ -48,7 +48,7 @@
</mat-card-content>
<mat-card-footer align="end">
- <button mat-raised-button color="primary" (click)="close()">
+ <button mat-raised-button class="primary" (click)="close()">
Close
</button>
</mat-card-footer>
@@ -105,7 +105,7 @@
</mat-card-content>
<mat-card-footer align="end">
- <button mat-raised-button color="primary" (click)="close()">
+ <button mat-raised-button class="primary" (click)="close()">
Close
</button>
</mat-card-footer>
diff --git a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
index edd8a3d073b8220b0c0c1e6ad07932265badf5a5..31cffd512f4579d37f799adcfe083508e7c09cba 100644
--- a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
@@ -9,24 +9,28 @@
<!-- Rate data -->
<mat-tab label="Rate Data" [disabled]="hasData() === false">
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="rateTableData()"
- buttonText="Export rates as CSV"
- title="Rates"
- filename="rates {{ parameters() }}.csv"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="rateTableData()"
+ buttonText="Export rates as CSV"
+ title="Rates"
+ filename="rates {{ parameters() }}.csv"
+ />
+ </div>
</ng-template>
</mat-tab>
<!-- Probability data -->
<mat-tab label="Probability Data" [disabled]="hasData() === false">
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="probabilityTableData()"
- buttonText="Export probabilities as CSV"
- title="Probabilities"
- filename="probabilities {{ parameters() }}.csv"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="probabilityTableData()"
+ buttonText="Export probabilities as CSV"
+ title="Probabilities"
+ filename="probabilities {{ parameters() }}.csv"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/styles/_code-block.scss b/projects/nshmp-apps/src/styles/_code-block.scss
index 5a35435a80f7f778daa6a5b683586074acfd4d97..eaa0ef9af9fb5dbd4ac7f0ff2d45d626e0580d39 100644
--- a/projects/nshmp-apps/src/styles/_code-block.scss
+++ b/projects/nshmp-apps/src/styles/_code-block.scss
@@ -2,13 +2,8 @@
@use '@ghsc/nshmp-template/styles/variables';
.code-block {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent);
font-size: clamp(8px, 6px + 1vw, 14px);
line-height: clamp(0.75em, 0.5em + 1vw, 1.5em);
overflow-x: scroll;
padding: 0 1em;
}
-
-body.dark-mode .code-block {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent, 700);
-}
diff --git a/projects/nshmp-apps/src/styles/_parameter-summary.scss b/projects/nshmp-apps/src/styles/_parameter-summary.scss
index cbf815ad00131a55b6d5279b99db01da19035d28..df71d76c2ac2170f13442180f727f5b93e4b0ac4 100644
--- a/projects/nshmp-apps/src/styles/_parameter-summary.scss
+++ b/projects/nshmp-apps/src/styles/_parameter-summary.scss
@@ -1,20 +1,15 @@
@use '@angular/material' as mat;
-$list-typography: mat.m2-define-typography-config(
- $body-1:
- mat.m2-define-typography-level(
- $font-size: 14px,
- $line-height: 18px,
- ),
-);
-
.parameter-summary {
- mat-list.parameter-list {
- @include mat.list-typography($list-typography);
+ @include mat.list-overrides(
+ (
+ list-item-label-text-size: 14px,
+ list-item-one-line-container-height: 2em,
+ )
+ );
+ mat-list.parameter-list {
mat-list-item {
- height: 2em;
-
.parameter {
font-weight: 700;
}
@@ -24,9 +19,5 @@ $list-typography: mat.m2-define-typography-config(
height: 1em;
padding-left: 1.5em;
}
-
- .indent-list.font-small {
- @include mat.list-typography($list-typography);
- }
}
}
diff --git a/projects/nshmp-apps/src/styles/_scrolling.scss b/projects/nshmp-apps/src/styles/_scrolling.scss
index d7d2ada65e3a8d6f589350d560cd5d4846127e37..0ec9a4fe6a1215b071979c0a49370f01baf12d19 100644
--- a/projects/nshmp-apps/src/styles/_scrolling.scss
+++ b/projects/nshmp-apps/src/styles/_scrolling.scss
@@ -31,7 +31,7 @@ $spacing: 1em !default;
}
}
-$dark-mode-accent: mat.m2-get-color-from-palette(variables.$nshmp-accent, 800);
+$dark-mode-accent: variables.$nshmp-secondary-color;
body.dark-mode {
.horizontal-scrolling {