Skip to content

Commit 3ff398d

Browse files
committed
Convert stylus to sass
1 parent 29c2781 commit 3ff398d

File tree

4 files changed

+63
-72
lines changed

4 files changed

+63
-72
lines changed

package.json

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"scripts": {
99
"dev": "storybook dev -p 6006 --no-open",
1010
"build:storybook": "storybook build --debug",
11-
"build": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers/build-all.ts",
11+
"build": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers build",
1212
"status": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers status",
1313
"prepare": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers prepare",
1414
"publish": "NODE_NO_WARNINGS=1 tsx scripts/publish-helpers publish",
@@ -44,29 +44,24 @@
4444
"marked": "^11.0",
4545
"marked-terminal": "^7.1.0",
4646
"node-fetch": "^3.2.9",
47-
"react": "^19",
48-
"react-dom": "^19",
47+
"react": "^18||^19",
48+
"react-dom": "^18||^19",
4949
"storybook": "10.1.11",
5050
"tsx": "^4.19.1",
5151
"typescript": "^5.8.3",
5252
"underscore": "^1.12.0",
5353
"use-async-effect": "^2.2.1",
54-
"vite": "^7.2.7"
54+
"madge": "^8.0.0",
55+
"prettier": "^3.7.4"
5556
},
5657
"resolutions": {
57-
"@types/react": "18.3.12",
5858
"react": "^19",
59-
"react-dom": "^19",
60-
"rollup": "4.44.2"
59+
"react-dom": "^19"
6160
},
6261
"workspaces": [
6362
"packages/*",
6463
"toolchain/*",
6564
"examples/*"
6665
],
67-
"packageManager": "[email protected]",
68-
"devDependencies": {
69-
"madge": "^8.0.0",
70-
"prettier": "^3.7.4"
71-
}
66+
"packageManager": "[email protected]"
7267
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
.chip
2+
padding: 3px 6px
3+
margin: 2px 6px 2px 0
4+
border-radius: 5px
5+
text-align: center
6+
&.emphasized
7+
font-weight: 600
8+
9+
.age-chip-container
10+
font-family: 'Montserrat', sans-serif
11+
font-weight: 700
12+
display: inline-block
13+
14+
.age-chip
15+
display: inline-block
16+
17+
:global(.bp6-dark) .age-chip
18+
color: #fff
19+
20+
.age-chip-age
21+
font-size: 75%
22+
23+
.age-chip-ma
24+
font-size: 70%
25+
font-weight: 400
26+
27+
.age-ma
28+
font-style: italic
29+
30+
.lith-chip
31+
display: inline-block
32+
font-size: 12px
33+
background-repeat: repeat
34+
background-size: cover
35+
//background-color: rgba(255,255,255,0.5);

packages/map-interface/src/location-details/info-blocks.module.styl

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

packages/map-interface/src/location-details/main.module.styl renamed to packages/map-interface/src/location-details/main.module.sass

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
.spacer
2-
flex-grow 1
3-
pointer-events none
2+
flex-grow: 1
3+
pointer-events: none
44

55
.infodrawer-content
6-
margin: 0;
6+
margin: 0
77

88
.macrostrat-detail
9-
display: flex;
10-
align-items: center;
11-
margin 0.2em 0 0.4em;
9+
display: flex
10+
align-items: center
11+
margin: 0.2em 0 0.4em
1212

1313
.expansion-summary-title
14-
margin-right: 0.8em;
14+
margin-right: 0.8em
1515

1616
&:after
17-
content: ":";
17+
content: ":"
1818

1919
.described-age, .macrostrat-detail
20-
display: flex;
21-
align-items: center;
20+
display: flex
21+
align-items: center
2222

2323
.expansion-summary-title
24-
margin-right: 0.8em;
24+
margin-right: 0.8em
2525

2626
&:after
27-
content: ":";
27+
content: ":"
2828

2929
.description
30-
font-style italic
31-
font-size 0.7em
30+
font-style: italic
31+
font-size: 0.7em
3232
max-width: 100px
3333
text-align: right
3434

3535
.age-chips
36-
flex-grow 1
36+
flex-grow: 1
3737

3838

3939
// &.loading
@@ -43,22 +43,22 @@
4343
4444
4545
.spacer
46-
flex-grow 1
47-
pointer-events none
46+
flex-grow: 1
47+
pointer-events: none
4848

4949
.macrostrat-unit
5050
h3
51-
margin: 0.5em 0 0.5em;
52-
flex-grow: 1;
51+
margin: 0.5em 0 0.5em
52+
flex-grow: 1
5353

5454
.description
5555
margin-right: 1em
5656

5757
.description
58-
font-style italic
58+
font-style: italic
5959

6060
.age-refinement-plot
61-
position relative
61+
position: relative
6262

6363
.age-refinement-bar
6464
border-radius: 3px

0 commit comments

Comments
 (0)