Skip to content

Commit fe5111c

Browse files
committed
SD-106: Adjust button styling
1 parent fc0e186 commit fe5111c

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

src/domains/chains/components/ChainSelector.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const StyledButton = styled(Button)`
8282
padding-inline: ${vars('--spacing-s')};
8383
width: ${CHAIN_SELECTOR_WIDTH}px;
8484
85+
border-radius: ${vars('--spacing-s')};
8586
background: ${vars('--color-neutral-background-1-rest')};
8687
border-color: ${vars('--color-neutral-stroke-2-rest')};
8788
overflow: hidden;

src/domains/misc/components/Button/Button.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,7 @@ const DomButton = styled.button.withConfig({
108108
'extra-small': typography.caption1Strong,
109109
tiny: typography.caption2Strong,
110110
})};
111-
border-radius: ${perSize({
112-
large: vars('--border-radius-s'),
113-
medium: vars('--border-radius-s'),
114-
small: vars('--border-radius-s'),
115-
'extra-small': vars('--border-radius-s'),
116-
tiny: vars('--border-radius-xs'),
117-
})};
111+
border-radius: ${vars('--border-radius-circular')};
118112
transition: background-color ${transitionTime}, color ${transitionTime};
119113
120114
outline-offset: -${BORDER_WIDTH}px;

src/domains/misc/components/Layout/TopBar/NavBox.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ const ContentWrapper = styled.section`
5353
display: flex;
5454
5555
justify-content: space-between;
56+
align-items: center;
5657
gap: ${vars('--spacing-xs')};
5758
5859
width: 100%;

src/domains/misc/components/Layout/TopBar/TopBar.tsx

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ConnectModal from 'src/domains/chains/components/ConnectModal';
66
import { useWallet } from 'src/domains/chains/components/WalletProvider';
77
import Button from 'src/domains/misc/components/Button';
88
import { useModal } from 'src/domains/misc/components/Modal';
9-
import { BOTTOM_MENU_BREAKPOINT } from 'src/domains/misc/consts/consts';
9+
import { BOTTOM_MENU_BREAKPOINT, BREAKPOINTS } from 'src/domains/misc/consts/consts';
1010
import formatAddress from 'src/domains/misc/utils/formatAddress';
1111
import { typography } from 'src/domains/styling/utils/tokens';
1212
import vars from 'src/domains/styling/utils/vars';
@@ -20,6 +20,8 @@ import UserIcon from './userIcon.svg?react';
2020

2121
const TopBar = () => {
2222
const isSmallScreen = useMediaQuery(`(max-width: ${BOTTOM_MENU_BREAKPOINT})`);
23+
const isLargeScreen = useMediaQuery(`(width > ${BREAKPOINTS.lg}`);
24+
2325
const { disconnect, isConnected , address } = useWallet();
2426
const { open } = useModal();
2527

@@ -31,8 +33,8 @@ const TopBar = () => {
3133
</BrandContainer>
3234
{!isSmallScreen && <Navigation position="floor" />}
3335
</NavBox.BrandCanvas>
34-
<NavBox.UserCanvas>
35-
{isConnected ? (
36+
{isConnected ? (
37+
<NavBox.UserCanvas>
3638
<AccountManager>
3739
<ChainSelector />
3840
<Divider />
@@ -48,15 +50,18 @@ const TopBar = () => {
4850
</PowerButton>
4951
</AccountDetails>
5052
</AccountManager>
51-
) : (
53+
</NavBox.UserCanvas>
54+
) : (
55+
<ConnectButtonWrapper>
5256
<Button
5357
onClick={() => void open(<ConnectModal />)}
5458
variant="primary"
59+
size={isLargeScreen ? 'medium' : 'small'}
5560
>
5661
Connect
5762
</Button>
58-
)}
59-
</NavBox.UserCanvas>
63+
</ConnectButtonWrapper>
64+
)}
6065
</NavBox.Container>
6166
);
6267
};
@@ -104,3 +109,13 @@ const Divider = styled.div`
104109
const PowerButton = styled(Button)`
105110
color: ${vars('--color-neutral-foreground-2-rest')};
106111
`;
112+
113+
const ConnectButtonWrapper = styled.div`
114+
display: flex;
115+
padding-left: ${vars('--spacing-m-nudge')};
116+
padding-right: ${vars('--spacing-l')};
117+
118+
@media (width > ${BREAKPOINTS.lg}) { /* stylelint-disable-line media-query-no-invalid */
119+
padding-inline: ${vars('--spacing-s')};
120+
}
121+
`;

0 commit comments

Comments
 (0)