Skip to content

Commit

Permalink
Merge pull request #215 from UW-Macrostrat/correlation
Browse files Browse the repository at this point in the history
Starting point for map correlation diagram
  • Loading branch information
davenquinn authored Jun 3, 2024
2 parents 594e69a + 70ecd87 commit de91767
Show file tree
Hide file tree
Showing 14 changed files with 940 additions and 30 deletions.
2 changes: 1 addition & 1 deletion deps/web-components
2 changes: 1 addition & 1 deletion src/components/lithology/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const h = hyper.styled(styles);

export function LithologyTag({
data,
className,
className = null,
tooltip = null,
tooltipProps = {},
expandOnHover = false,
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/main.module.sass
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@


.fullscreen-page
margin: 1em auto 3em
padding: 0 4em
padding: 1em 4em 3em
21 changes: 14 additions & 7 deletions src/pages/maps/@id/+Page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -349,13 +349,20 @@ function MapLegendPanel(params) {
h("div.flex.row", [
h("h3", "Legend"),
h("div.spacer"),
h(
DevLink,
// Not sure why we have to fully construct the URL here, vs. constructing a relative route.
// Probably lack of a trailing slash in the main page?
{ href: `/maps/${params.source_id}/legend` },
"Legend table"
),
h("div.dev-links", [
h(
DevLink,
// Not sure why we have to fully construct the URL here, vs. constructing a relative route.
// Probably lack of a trailing slash in the main page?
{ href: `/maps/${params.source_id}/legend` },
"Legend table"
),
h(
DevLink,
{ href: `/maps/${params.source_id}/correlation` },
"Correlation of units"
),
]),
]),
h(MapLegendData, params),
])
Expand Down
Loading

0 comments on commit de91767

Please sign in to comment.