Skip to content

Commit c0f8fc9

Browse files
authored
Merge pull request #397 from UW-Macrostrat/column-fixes
Column fixes
2 parents 475672e + f696479 commit c0f8fc9

File tree

8 files changed

+623
-269
lines changed

8 files changed

+623
-269
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@macrostrat/api-types": "^1.1.3",
6565
"@macrostrat/color-utils": "^1.1.2",
6666
"@macrostrat/column-components": "^1.3.1",
67-
"@macrostrat/column-views": "^2.2.1",
67+
"@macrostrat/column-views": "^2.2.2",
6868
"@macrostrat/data-components": "^0.2.2",
6969
"@macrostrat/data-sheet": "^2.2.1",
7070
"@macrostrat/feedback-components": "^1.1.10",
@@ -122,6 +122,7 @@
122122
"immutability-helper": "^3.1.1",
123123
"jose": "^5.1.2",
124124
"jotai": "^2.15.1",
125+
"jotai-location": "^0.6.2",
125126
"mapbox-gl": "^3.13.0",
126127
"new-github-issue-url": "^1.0.0",
127128
"part-regex": "^0.1.2",

pages/columns/@column/column-inspector/index.module.sass

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,41 @@
2727
top: 0
2828
display: flex
2929
flex-direction: column
30-
padding: 2em 0
30+
padding: 2em 1em
31+
overflow-y: scroll
3132

3233
& > *
3334
border-radius: 4px
3435

36+
h3
37+
color: var(--secondary-color)
38+
39+
.column-settings-panel
40+
:global
41+
.bp5-form-group, .bp5-control-group
42+
.bp5-label
43+
color: var(--text-color)
44+
flex-grow: 1
45+
46+
.facet-control
47+
:global(.bp5-html-select).unset select
48+
color: var(--secondary-color)
49+
font-style: italic
50+
51+
:global(.bp5-label) .facet-label :global(.bp5-popover-target)
52+
margin-left: 0.2em
53+
display: inline
54+
55+
.range-control
56+
:global
57+
.bp5-form-group, .bp5-control-group
58+
flex: 1
59+
justify-content: space-between
60+
61+
.bp5-control-group > *
62+
flex-grow: unset
63+
flex-shrink: unset
64+
3565
.right-column-boxes
3666
display: flex
3767
flex-direction: column
@@ -60,8 +90,7 @@
6090
top: 2.2em
6191

6292
h3
63-
color: #444
64-
margin-bottom: 0.3em
93+
color: var(--secondary-color)
6594

6695
.default-buttons
6796
width: 100%

0 commit comments

Comments
 (0)