Skip to content

Commit ad2934e

Browse files
committed
merge fixes
1 parent 2b84f88 commit ad2934e

File tree

5 files changed

+3
-58
lines changed

5 files changed

+3
-58
lines changed

pages/index.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,3 @@ export function SearchBar({ onChange, placeholder = "Search..." }) {
118118
}),
119119
]);
120120
}
121-
122-
export function SearchBar({ onChange, placeholder = "Search..." }) {
123-
return h(Card, { className: "search-bar" }, [
124-
h(Icon, { icon: "search" }),
125-
h("input", {
126-
type: "text",
127-
placeholder,
128-
onChange: (e) => onChange(e.target.value),
129-
}),
130-
]);
131-
}

pages/lex/+Page.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,12 @@ export function Page() {
5252
h("p.stat", `${formatNumber(measurements)} measurements`),
5353
]),
5454

55-
h("h2", "Stratigraphic names"),
56-
55+
h("h2", "Dictionaries"),
5756
h(
5857
LinkCard,
5958
{ href: "/lex/strat-names", title: "Stratigraphic names" },
60-
"Names of rock units, organized hierarchically"
59+
"Names of rock units, organized hierarchically and concepts that capture relationships between differently-named rock units"
6160
),
62-
h(
63-
LinkCard,
64-
{ href: "/lex/strat-name-concepts", title: "Stratigraphic concepts" },
65-
"Concepts that capture relationships between differently-named rock units"
66-
),
67-
68-
h("h2", "Dictionaries"),
6961

7062
h(
7163
LinkCard,

pages/lex/Page.mdx

Lines changed: 0 additions & 35 deletions
This file was deleted.

pages/lex/timescales/@id/+Page.client.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import "./main.scss";
2-
import h from "@macrostrat/hyper";
1+
import h from "./main.module.scss";
32
import { useAPIResult } from "@macrostrat/ui-components";
43
import { SETTINGS } from "@macrostrat-web/settings";
54
import {

0 commit comments

Comments
 (0)