Skip to content

fix: market dropdown position and some spot styles #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwjanus merged 1 commit into from
Dec 15, 2025
Merged

fix: market dropdown position and some spot styles #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ const Content = () => {

// Check if we're on the trade page
const isTradePage = matchPath(`${AppRoute.Trade}/*`, location.pathname) !== null;
const isSpotPage = matchPath(`${AppRoute.Spot}/*`, location.pathname) !== null;

if (isSimpleUi) {
const matchMarkets = matchPath(AppRoute.Markets, location.pathname);
Expand Down Expand Up @@ -197,7 +198,7 @@ const Content = () => {
return (
<>
<GlobalStyle />
<$AppContainer isTradePage={isTradePage}>
<$AppContainer isTradePage={isTradePage || isSpotPage}>
<$Content
isShowingHeader={isShowingHeader}
isShowingFooter={isShowingFooter}
Expand Down
3 changes: 3 additions & 0 deletions src/pages/spot/Spot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,13 @@ const $SpotLayout = styled.article<{

const $GridSection = styled.section<{ gridArea: string }>`
grid-area: ${({ gridArea }) => gridArea};
border: var(--default-border-width, 1px) solid var(--color-border) !important;
border-radius: 0.75rem !important;
`;

const $SideGridSection = styled($GridSection)`
${layoutMixins.withInnerHorizontalBorders}
background-color: var(--color-layer-1);
`;

const $Output = styled(Output)`
Expand Down
11 changes: 11 additions & 0 deletions src/pages/spot/SpotHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,15 @@ const $Container = styled.div`
grid-auto-flow: column;
justify-content: start;
align-items: stretch;

background-color: var(--color-layer-1);

/* Completely override box-shadow border from withOuterAndInnerBorders */
--border-color: transparent !important;
box-shadow: none !important;

/* Apply rounded border using border property which respects border-radius */
border: var(--default-border-width, 1px) solid var(--color-border) !important;
border-radius: 0.75rem !important;
overflow: hidden; // Clip content and borders to rounded corners
`;
5 changes: 4 additions & 1 deletion src/pages/spot/SpotMarketsDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export const SpotMarketsDropdown = ({
noBlur
sideOffset={1}
className={className}
align="start"
slotTrigger={
<$TriggerContainer $isOpen={isOpen}>
<div tw="flex items-center gap-0.25">
Expand Down Expand Up @@ -236,7 +237,9 @@ const $Popover = styled(Popover)`
max-width: 100vw;

box-shadow: 0 0 0 1px var(--color-border);
border-radius: 0;

border: var(--default-border-width, 1px) solid var(--color-border);
border-radius: 0.75rem;

&:focus-visible {
outline: none;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/trade/MarketSelectorAndStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const $Container = styled.div`
grid-auto-flow: column;
justify-content: start;
align-items: stretch;
background-color: var(--color-layer-1) !important; // TODO: figure out why this is needed
background-color: var(--color-layer-1);

/* Completely override box-shadow border from withOuterAndInnerBorders */
--border-color: transparent !important;
Expand Down
4 changes: 2 additions & 2 deletions src/views/MarketFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const MarketFilter = forwardRef(
}
value={selectedFilter}
onValueChange={onChangeFilter}
overflow="wrap"
overflow="scroll"
slotBefore={unlaunchedMarketSwitch}
/>
);
Expand All @@ -114,7 +114,7 @@ export const MarketFilter = forwardRef(
onTextChange={onSearchTextChange}
/>
</div>
<div tw="flex w-full items-center justify-start gap-0.5 overflow-hidden">
<div tw="relative flex w-full items-center justify-start gap-0.5 overflow-hidden overflow-x-auto">
{filterToggles}
</div>
</$MarketFilter>
Expand Down
Loading