diff --git a/app/assets/scripts/components/common/card-list.js b/app/assets/scripts/components/common/card-list.js index 7b2cd41e..3ceb5bc5 100644 --- a/app/assets/scripts/components/common/card-list.js +++ b/app/assets/scripts/components/common/card-list.js @@ -172,6 +172,7 @@ Card.propTypes = { const CardListContainer = styled.ol` display: grid; + height: min-content; grid-template-columns: ${({ numColumns }) => { if (numColumns) { return css`repeat(${numColumns}, 1fr)`; @@ -185,7 +186,7 @@ const CardListScroll = styled(ShadowScrollbar)` flex: 1; `; const CardListWrapper = styled(PanelBlockBody)` - height: 100%; + height: min-content; ${({ nonScrolling }) => nonScrolling && css` diff --git a/app/assets/scripts/components/common/map/constants.js b/app/assets/scripts/components/common/map/constants.js index 30d6429c..ed1b843f 100644 --- a/app/assets/scripts/components/common/map/constants.js +++ b/app/assets/scripts/components/common/map/constants.js @@ -1 +1,3 @@ export const BOUNDS_PADDING = [25, 25]; + +export const MOSAIC_LAYER_OPACITY = 0.8; diff --git a/app/assets/scripts/components/common/tabbed-block-body.js b/app/assets/scripts/components/common/tabbed-block-body.js index 4d28ba54..d1e60162 100644 --- a/app/assets/scripts/components/common/tabbed-block-body.js +++ b/app/assets/scripts/components/common/tabbed-block-body.js @@ -80,8 +80,10 @@ const TabbedBlockHeader = styled(PanelBlockHeader)` ${listReset} display: flex; flex-flow: row nowrap; - justify-content: space-between; - padding: 0 ${glsp(1.5)}; + justify-content: ${({ leftAligned }) => + leftAligned ? 'flex-start' : 'space-between'}; + gap: ${glsp()}; + padding: ${({ leftAligned }) => (leftAligned ? '0' : '0 1.5rem')}; box-shadow: inset 0 -1px 0 0 ${themeVal('color.baseAlphaB')}; } /* PanelBlockHeader sets z-index. This causes @@ -108,11 +110,11 @@ const PanelBlockScroll = styled(ScrollableBody)` `; function TabbedBlock(props) { - const { children, activeTab } = props; + const { children, activeTab, leftAligned } = props; return ( <> - +