Skip to content

Commit 7ac2285

Browse files
committed
Merge branch 'style-fixes'
* style-fixes: Updated changelogs Improve styles for location panel Updated status tongue style
2 parents b3de8da + 723bca7 commit 7ac2285

File tree

9 files changed

+19
-18
lines changed

9 files changed

+19
-18
lines changed

packages/column-views/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
44
is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
55
project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.0.3] - 2025-03-08
8+
9+
Export `UnitDetailsPanel`
10+
711
## [1.0.2] - 2025-02-16
812

913
Improve column styles

packages/column-views/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@macrostrat/column-views",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "Data views for Macrostrat stratigraphic columns",
55
"type": "module",
66
"source": "src/index.ts",

packages/column-views/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ export * from "./providers";
55
export * from "./helpers";
66
export * from "./map";
77
export * from "./column";
8+
export * from "./unit-details";

packages/map-interface/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
44
is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
55
project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.2.4] - 2025-03-08
8+
9+
Fix some small styling errors
10+
711
## [1.2.3] - 2025-02-23
812

913
- Allow map interface to be rendered without a context panel

packages/map-interface/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@macrostrat/map-interface",
3-
"version": "1.2.3",
3+
"version": "1.2.4",
44
"description": "Map interface for Macrostrat",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

packages/map-interface/src/context-panel/main.module.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
width: 40px
3030
height: 40px
3131

32-
.status-tongue
32+
.status-tongue:global(.bp5-card)
3333
background-color: var(--panel-background-color)
3434
margin: 5px
3535
margin-bottom: 0

packages/map-interface/src/location-panel/main.module.sass

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
flex-direction: column
5252
overflow-y: hidden
5353
background-color: var(--panel-background-color)
54+
--panel-padding: 0
5455

5556
&:global(.bp5-card)
5657
padding: 0
@@ -67,8 +68,12 @@
6768
padding: 0 1em
6869
&>:first-child
6970
margin-top: 1rem
71+
&>div:first-child
72+
margin-top: 0
7073
&>:last-child
7174
margin-bottom: 1rem
75+
&>div:last-child
76+
margin-bottom: 0
7277

7378
// The scrollable body of the infodrawer
7479
.infodrawer-body

packages/map-interface/src/main.module.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
padding: 10px
107107
background-color: var(--panel-background-color)
108108

109-
.panel-card
110-
padding: 10px
109+
.panel-card, .panel-card:global(.bp5-card)
110+
padding: var(--panel-padding, 10px)
111111
background-color: var(--panel-background-color)
112112
overflow: hidden
113113
border-radius: var(--map-panel-border-radius)

packages/map-styles/src/layer-helpers/index.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@ export interface LayerDescription {
1717
url: string;
1818
}
1919

20-
export const baseLayers: LayerDescription[] = [
21-
{
22-
id: "satellite",
23-
name: "Satellite",
24-
url: "mapbox://styles/mapbox/satellite-v9",
25-
},
26-
{
27-
id: "hillshade",
28-
name: "Hillshade",
29-
url: "mapbox://styles/jczaplewski/ckml6tqii4gvn17o073kujk75",
30-
},
31-
];
32-
3320
const vizBaseURL = "//visualization-assets.s3.amazonaws.com";
3421
const patternBaseURL = vizBaseURL + "/geologic-patterns/png";
3522
const lineSymbolsURL = vizBaseURL + "/geologic-line-symbols/png";

0 commit comments

Comments
 (0)