Skip to content

Commit 02339a6

Browse files
committed
Updated styles
1 parent 7df0beb commit 02339a6

File tree

8 files changed

+97
-171
lines changed

8 files changed

+97
-171
lines changed

packages/column-components/stories/base-section.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
TimescaleOrientation,
1818
IncreaseDirection,
1919
} from "@macrostrat/timescale";
20-
import styles from "./measured-section.module.sass";
20+
import styles from "./measured-section.stories.module.sass";
2121

2222
const h = hyper.styled(styles);
2323

packages/column-components/stories/measured-section.module.sass

Lines changed: 0 additions & 72 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
//:global
2+
// @require "./imported"
3+
4+
@use "sass:color"
5+
6+
.measured-section
7+
display: flex
8+
flex-direction: row
9+
10+
:global
11+
.timescale
12+
margin-top: 30px
13+
.spacer
14+
flex-grow: 2
15+
16+
// Move units a bit to the right to avoid cut-off stroke
17+
.lithology-column
18+
transform: translate(1px, 0px)
19+
20+
.labeled-unit div.unit-overlay
21+
font-size: 14px
22+
text-align: center
23+
24+
g.unit
25+
rect.unit
26+
stroke-width: 1.5px
27+
28+
g.lithology-column use.frame
29+
stroke: black
30+
31+
@media (prefers-color-scheme: dark)
32+
.lithology-column .frame
33+
stroke: white
34+
g.inner
35+
pattern: image
36+
filter: invert(100%)
37+
38+
.column.age-axis
39+
width: 55px
40+
41+
.column .tick text
42+
font-size: 14px
43+
44+
.column
45+
flex: 0
46+
.age-axis-label
47+
font-size: 14px
48+
49+
.map-area
50+
height: 220px
51+
52+
@mixin interval($color)
53+
&>.interval-box
54+
margin: 0px
55+
background-color: color.adjust($color, $lightness: 50%)
56+
border: 2px solid color.adjust($color, $lightness: 10%) !important
57+
.interval-label
58+
color: color.adjust($color, $lightness: -30%)
59+
60+
.interval
61+
&.Blueflower
62+
@include interval(dodgerblue)
63+
&.Gametrail
64+
@include interval(#c0ddc6)
65+
&.Rackla
66+
@include interval(#aaa)

packages/column-components/stories/measured-section.stories.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import h from "@macrostrat/hyper";
22
import { ColumnDivision, ColumnSurface } from "@macrostrat/column-components";
33
import { BaseUnit } from "@macrostrat/api-types";
4-
import { IUnit } from "@macrostrat/column-views";
5-
import "./measured-section.module.sass";
4+
import "./measured-section.stories.module.sass";
65

76
import { MeasuredSection } from "./base-section";
87

packages/column-components/stories/measured-section.styl

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

packages/column-components/stories/zebra-nappe.sass

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.zebra-nappe-section :global
2+
.y.axis
3+
font-size: 12px
4+
text-align: center
5+
position: sticky
6+
transform: translateY(-1px)
7+
8+
.tick text
9+
text-anchor: middle
10+
font-weight: 400
11+
transform: rotate(-90deg) translate(8px, -12px)
12+
13+
.timescale
14+
color: white
15+
font-weight: 500
16+
17+
g.lithology-column
18+
transform: translateX(1px)
19+
rect.lithology
20+
stroke: white
21+
stroke-width: 1px
22+
use.frame
23+
stroke: white

packages/column-components/stories/stratigraphy.stories.ts renamed to packages/column-components/stories/zebra-nappe.stories.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import h from "@macrostrat/hyper";
1+
import hyper from "@macrostrat/hyper";
22
import {
33
ColumnDivision,
44
ColumnSurface,
55
ParameterIntervals,
66
} from "@macrostrat/column-components";
77
import { BaseUnit } from "@macrostrat/api-types";
8-
import "./measured-section.module.sass";
98
import zebraNappeIntervals from "./naukluft-intervals.json";
109
import namaIntervals from "./nama-intervals.json";
11-
import "./zebra-nappe.sass";
10+
import styles from "./zebra-nappe.stories.module.sass";
11+
12+
const h = hyper.styled(styles);
1213

1314
import { MeasuredSection } from "./base-section";
1415
import { defaultResolveID } from "@macrostrat/column-components";
@@ -40,6 +41,7 @@ export function ZebraRiverGroup() {
4041
MeasuredSection,
4142
{
4243
data: surfaces,
44+
className: "zebra-nappe-section",
4345
timescaleProps: {
4446
intervals,
4547
levels: [0, 2],
@@ -88,6 +90,7 @@ export function NamaGroup() {
8890
MeasuredSection,
8991
{
9092
data: surfaces,
93+
className: "zebra-nappe-section",
9194
timescaleProps: {
9295
intervals,
9396
levels: [0, 2],

0 commit comments

Comments
 (0)